From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Nov 2011 17:11:16 +0000 (-0800)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Tag: v3.2-rc1~14
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=e0d65113a70f1dc514e625cc4e7a7485a4bf72df

Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (226 commits)
  mtd: tests: annotate as DANGEROUS in Kconfig
  mtd: tests: don't use mtd0 as a default
  mtd: clean up usage of MTD_DOCPROBE_ADDRESS
  jffs2: add compr=lzo and compr=zlib options
  jffs2: implement mount option parsing and compression overriding
  mtd: nand: initialize ops.mode
  mtd: provide an alias for the redboot module name
  mtd: m25p80: don't probe device which has status of 'disabled'
  mtd: nand_h1900 never worked
  mtd: Add DiskOnChip G3 support
  mtd: m25p80: add EON flash EN25Q32B into spi flash id table
  mtd: mark block device queue as non-rotational
  mtd: r852: make r852_pm_ops static
  mtd: m25p80: add support for at25df321a spi data flash
  mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
  mtd: nand: switch `check_pattern()' to standard `memcmp()'
  mtd: nand: invalidate cache on unaligned reads
  mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
  mtd: nand: wait to set BBT version
  mtd: nand: scrub BBT on ECC errors
  ...

Fix up trivial conflicts:
 - arch/arm/mach-at91/board-usb-a9260.c
	Merged into board-usb-a926x.c
 - drivers/mtd/maps/lantiq-flash.c
	add_mtd_partitions -> mtd_device_register vs changed to use
	mtd_device_parse_register.
---

e0d65113a70f1dc514e625cc4e7a7485a4bf72df
diff --cc arch/arm/mach-at91/board-usb-a926x.c
index 5852d3d9890c,909fd9743950..0a20bab21f99
--- a/arch/arm/mach-at91/board-usb-a926x.c
+++ b/arch/arm/mach-at91/board-usb-a926x.c
@@@ -202,10 -123,11 +196,11 @@@ static struct atmel_nand_data __initdat
  //	.det_pin	= ... not connected
  	.rdy_pin	= AT91_PIN_PA22,
  	.enable_pin	= AT91_PIN_PD15,
- 	.partition_info	= nand_partitions,
+ 	.parts		= ek_nand_partition,
+ 	.num_parts	= ARRAY_SIZE(ek_nand_partition),
  };
  
 -static struct sam9_smc_config __initdata ek_nand_smc_config = {
 +static struct sam9_smc_config __initdata usb_a9260_nand_smc_config = {
  	.ncs_read_setup		= 0,
  	.nrd_setup		= 1,
  	.ncs_write_setup	= 0,