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.

diff --cc arch/arm/mach-at91/board-afeb-9260v1.c
Simple merge

diff --cc arch/arm/mach-at91/board-cam60.c
Simple merge

diff --cc arch/arm/mach-at91/board-cap9adk.c
Simple merge

diff --cc arch/arm/mach-at91/board-kb9202.c
Simple merge

diff --cc arch/arm/mach-at91/board-neocore926.c
Simple merge

diff --cc arch/arm/mach-at91/board-qil-a9260.c
Simple merge

diff --cc arch/arm/mach-at91/board-rm9200dk.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9-l9260.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9260ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9261ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9263ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9g20ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9m10g45ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9rlek.c
Simple merge

diff --cc arch/arm/mach-at91/board-usb-a926x.c
index 5852d3d9890c8d53d90ae185fdad8945f0044963,909fd97439500a3edf365870b9d546e2fa4003cf..0a20bab21f998ef5597be890f9ed47977d27d19f
--- 1/arch/arm/mach-at91/board-usb-a926x.c
--- 2/arch/arm/mach-at91/board-usb-a9263.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,

diff --cc arch/arm/mach-at91/board-yl-9200.c
Simple merge

diff --cc arch/arm/mach-at91/include/mach/board.h
Simple merge

diff --cc arch/arm/mach-davinci/board-da830-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-da850-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm355-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm355-leopard.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm365-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm644x-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-mityomapl138.c
Simple merge

diff --cc arch/arm/mach-davinci/board-neuros-osd2.c
Simple merge

diff --cc arch/arm/mach-davinci/board-tnetv107x-evm.c
Simple merge

diff --cc arch/arm/mach-ep93xx/ts72xx.c
Simple merge

diff --cc arch/arm/mach-mmp/aspenite.c
Simple merge

diff --cc arch/arm/mach-orion5x/ts78xx-setup.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x300.c
Simple merge

diff --cc arch/arm/mach-pxa/littleton.c
Simple merge

diff --cc arch/arm/mach-pxa/raumfeld.c
Simple merge

diff --cc arch/arm/mach-pxa/zylonite.c
Simple merge

diff --cc drivers/mtd/Kconfig
Simple merge

diff --cc drivers/mtd/ar7part.c
Simple merge

diff --cc drivers/mtd/cmdlinepart.c
Simple merge

diff --cc drivers/mtd/maps/lantiq-flash.c
Simple merge

diff --cc drivers/mtd/mtdchar.c
Simple merge

diff --cc drivers/mtd/mtdsuper.c
Simple merge

diff --cc drivers/mtd/nand/Kconfig
Simple merge

diff --cc drivers/mtd/nand/au1550nd.c
Simple merge

diff --cc drivers/mtd/nand/cafe_nand.c
Simple merge

diff --cc drivers/mtd/nand/cmx270_nand.c
Simple merge

diff --cc drivers/mtd/nand/diskonchip.c
Simple merge

diff --cc drivers/mtd/nand/nand_bbt.c
Simple merge

diff --cc drivers/mtd/nand/omap2.c
Simple merge

diff --cc drivers/mtd/nand/sm_common.c
Simple merge

diff --cc drivers/mtd/onenand/omap2.c
Simple merge

diff --cc drivers/mtd/onenand/onenand_bbt.c
Simple merge

diff --cc drivers/mtd/redboot.c
Simple merge

diff --cc fs/jffs2/fs.c
Simple merge

diff --cc include/linux/mtd/mtd.h
Simple merge