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
..
boards	- More robust parsing especially of xattr data in JFFS2	2012-06-01 16:55:42 -07:00
boot	Kbuild: centralize MKIMAGE and cmd_uimage definitions	2012-03-26 15:49:20 +02:00
cchips	sh: Convert to new function names	2011-03-29 14:48:13 +02:00
configs	SuperH updates for 3.5-rc1 merge window	2012-05-23 09:00:40 -07:00
drivers	sh: dma: More legacy cpu dma chainsawing.	2012-05-19 20:38:50 +09:00
include	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-06-01 11:53:44 -07:00
kernel	new helper: signal_delivered()	2012-06-01 12:58:52 -04:00
lib	sh: Ensure ST40-300 BogoMIPS value is consistent	2011-02-15 16:24:05 +09:00
lib64	Fix common misspellings	2011-03-31 11:26:23 -03:00
math-emu	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
mm	sh64: Fix up vmalloc fault range check.	2012-05-18 20:01:16 +09:00
oprofile	oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue	2011-12-23 11:58:34 +01:00
tools	sh: Add RSK2+SH7269 board	2012-05-10 17:20:01 +09:00
Kconfig	GPIO driver changes for v3.5 merge window	2012-05-24 14:01:46 -07:00
Kconfig.cpu	Fix typo in various Kconfig file	2012-04-16 14:40:08 +02:00
Kconfig.debug	sh: dwarf unwinder depends on SHcompact.	2012-03-30 19:31:22 +09:00
Makefile	SuperH updates for 3.5-rc1 merge window	2012-05-23 09:00:40 -07:00