Linus Torvalds f5e7e844a5 - More robust parsing especially of xattr data in JFFS2 ... - Updates to mxc_nand and gpmi drivers to support new boards and device tree - Improve consistency of information about ECC strength in NAND devices - Clean up partition handling of plat_nand - Support NAND drivers without dedicated access to OOB area - BCH hardware ECC support for OMAP - Other fixes and cleanups, and a few new device IDs -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAk/JG1wACgkQdwG7hYl686M80wCglN4kutx20j+KJWuZofkr9Hog weEAoI4jrqEWEdW9EcT2CIWQw7eG+1v+ =7tdo -----END PGP SIGNATURE----- Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd Pull mtd update from David Woodhouse: - More robust parsing especially of xattr data in JFFS2 - Updates to mxc_nand and gpmi drivers to support new boards and device tree - Improve consistency of information about ECC strength in NAND devices - Clean up partition handling of plat_nand - Support NAND drivers without dedicated access to OOB area - BCH hardware ECC support for OMAP - Other fixes and cleanups, and a few new device IDs Fixed trivial conflict in drivers/mtd/nand/gpmi-nand/gpmi-nand.c due to added include files next to each other. * tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd: (75 commits) mtd: mxc_nand: move ecc strengh setup before nand_scan_tail mtd: block2mtd: fix recursive call of mtd_writev mtd: gpmi-nand: define ecc.strength mtd: of_parts: fix breakage in Kconfig mtd: nand: fix scan_read_raw_oob mtd: docg3 fix in-middle of blocks reads mtd: cfi_cmdset_0002: Slight cleanup of fixup messages mtd: add fixup for S29NS512P NOR flash. jffs2: allow to complete xattr integrity check on first GC scan jffs2: allow to discriminate between recoverable and non-recoverable errors mtd: nand: omap: add support for hardware BCH ecc ARM: OMAP3: gpmc: add BCH ecc api and modes mtd: nand: check the return code of 'read_oob/read_oob_raw' mtd: nand: remove 'sndcmd' parameter of 'read_oob/read_oob_raw' mtd: m25p80: Add support for Winbond W25Q80BW jffs2: get rid of jffs2_sync_super jffs2: remove unnecessary GC pass on sync jffs2: remove unnecessary GC pass on umount jffs2: remove lock_super mtd: gpmi: add gpmi support for mx6q ...		2012-06-01 16:55:42 -07:00
..
alchemy	- More robust parsing especially of xattr data in JFFS2	2012-06-01 16:55:42 -07:00
ar7	Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next	2012-01-11 15:42:31 +01:00
ath79	MIPS: ath79: add initial support for the Atheros DB120 board	2012-05-15 17:49:11 +02:00
bcm47xx	bcma: Move initialization of SPROM to prevent overwrite	2012-05-16 12:46:03 -04:00
bcm63xx	MIPS: Remove all -Wall and almost all -Werror usage from arch/mips.	2012-05-21 15:09:36 +01:00
boot	MIPS: Alchemy: Basic support for the DB1300 board.	2011-12-07 22:02:06 +00:00
cavium-octeon	Merge branches 'fixes-for-linus', 'generic', 'cavium', 'module.h-fixes', 'next/ath79' and 'next/lantiq' into mips-for-linux-next	2012-05-26 19:55:48 +01:00
cobalt	MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD	2011-09-21 17:52:15 +02:00
configs	tokenring: delete all remaining driver support	2012-05-15 20:23:16 -04:00
dec	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
emma	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
fw	MIPS: Remove all -Wall and almost all -Werror usage from arch/mips.	2012-05-21 15:09:36 +01:00
include/asm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-06-01 10:34:35 -07:00
jazz	Merge branch 'next/generic' into mips-for-linux-next	2012-01-11 15:41:47 +01:00
jz4740	MIPS: Remove all -Wall and almost all -Werror usage from arch/mips.	2012-05-21 15:09:36 +01:00
kernel	new helper: signal_delivered()	2012-06-01 12:58:52 -04:00
lantiq	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-05-29 18:27:19 -07:00
lasat	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
lib	mips: use the the PCI controller's io_map_base	2012-01-31 23:20:30 +02:00
loongson	MIPS: irq: Remove IRQF_DISABLED	2011-12-07 22:03:45 +00:00
math-emu	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
mipssim	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
mm	MIPS: Use board_cache_error_setup for r4k cache error handler setup.	2012-05-16 23:34:34 +02:00
mti-malta	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
netlogic	remove references to cpu_*_map in arch/	2012-03-29 15:38:30 +10:30
oprofile	Merge branches 'fixes-for-linus', 'generic', 'cavium', 'module.h-fixes', 'next/ath79' and 'next/lantiq' into mips-for-linux-next	2012-05-26 19:55:48 +01:00
pci	Merge branches 'fixes-for-linus', 'generic', 'cavium', 'module.h-fixes', 'next/ath79' and 'next/lantiq' into mips-for-linux-next	2012-05-26 19:55:48 +01:00
pmc-sierra	Merge branches 'fixes-for-linus', 'generic', 'cavium', 'module.h-fixes', 'next/ath79' and 'next/lantiq' into mips-for-linux-next	2012-05-26 19:55:48 +01:00
pnx833x	mips: Use the plat_nand default partition parser	2012-05-13 22:47:08 -05:00
pnx8550	MIPS: irq: Remove IRQF_DISABLED	2011-12-07 22:03:45 +00:00
power	MIPS: Hibernation: Fixes for PAGE_SIZE >= 64kb	2011-05-10 18:15:26 +01:00
powertv	MIPS: Remove all -Wall and almost all -Werror usage from arch/mips.	2012-05-21 15:09:36 +01:00
rb532	- More robust parsing especially of xattr data in JFFS2	2012-06-01 16:55:42 -07:00
sgi-ip22	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
sgi-ip27	remove references to cpu_*_map in arch/	2012-03-29 15:38:30 +10:30
sgi-ip32	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
sibyte	documentation: remove references to cpu_*_map.	2012-03-29 15:38:31 +10:30
sni	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-05-29 18:27:19 -07:00
txx9	MIPS: txx9 7segled fix struct device has no member	2012-02-20 18:33:18 +01:00
vr41xx	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
wrppmc	MIPS: WRPPMC: Migrate to new platform makefile style.	2010-08-05 13:25:51 +01:00
Kbuild	MIPS: Repair Kbuild make clean breakage.	2010-10-19 18:32:39 +01:00
Kbuild.platforms	MIPS: XLR, XLS: Move makefile bits to were they belong.	2011-07-20 23:12:11 +01:00
Kconfig	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-05-29 18:27:19 -07:00
Kconfig.debug	Fix typo in various Kconfig file	2012-04-16 14:40:08 +02:00
Makefile	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2012-05-28 10:32:28 -07:00