Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd

Pull MTD update from David Woodhouse:

 - Lots of cleanups from Artem, including deletion of some obsolete
   drivers

 - Support partitions larger than 4GiB in device tree

 - Support for new SPI chips

* tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd: (83 commits)
  mtd: omap2: Use module_platform_driver()
  mtd: bf5xx_nand: Use module_platform_driver()
  mtd: denali_dt: Remove redundant use of of_match_ptr
  mtd: denali_dt: Change return value to fix smatch warning
  mtd: denali_dt: Use module_platform_driver()
  mtd: denali_dt: Fix incorrect error check
  mtd: nand: subpage write support for hardware based ECC schemes
  mtd: omap2: use msecs_to_jiffies()
  mtd: nand_ids: use size macros
  mtd: nand_ids: improve LEGACY_ID_NAND macro a bit
  mtd: add 4 Toshiba nand chips for the full-id case
  mtd: add the support to parse out the full-id nand type
  mtd: add new fields to nand_flash_dev{}
  mtd: sh_flctl: Use of_match_ptr() macro
  mtd: gpio: Use of_match_ptr() macro
  mtd: gpio: Use devm_kzalloc()
  mtd: davinci_nand: Use of_match_ptr()
  mtd: dataflash: Use of_match_ptr() macro
  mtd: remove h720x flash support
  mtd: onenand: remove OneNAND simulator
  ...

diff --cc arch/arm/mach-pxa/Kconfig
Simple merge

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

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

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

diff --cc drivers/mtd/nand/Kconfig
index 5d54ad32697fb9675773eb6c035c7a2058d2dfa3,1cca71208340fb505a7d752b344095e879a3d3c0..a60f6c17f57b62acd19528b62a7d1b329df12913
--- 1/drivers/mtd/nand/Kconfig
--- 2/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@@ -81,15 -73,9 +73,9 @@@ config MTD_NAND_DENALI_SCRATCH_REG_ADD
            scratch register here to enable this feature. On Intel Moorestown
            boards, the scratch register is at 0xFF108018.
  
- config MTD_NAND_H1900
-       tristate "iPAQ H1900 flash"
-       depends on ARCH_PXA && BROKEN
-       help
-         This enables the driver for the iPAQ h1900 flash.
- 
  config MTD_NAND_GPIO
        tristate "GPIO NAND Flash driver"
 -      depends on GENERIC_GPIO && ARM
 +      depends on GPIOLIB && ARM
        help
          This enables a GPIO based NAND flash driver.
  

diff --cc drivers/ssb/driver_mipscore.c
Simple merge