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

* git://git.infradead.org/mtd-2.6: (97 commits)
  mtd: kill CONFIG_MTD_PARTITIONS
  mtd: remove add_mtd_partitions, add_mtd_device and friends
  mtd: convert remaining users to mtd_device_register()
  mtd: samsung onenand: convert to mtd_device_register()
  mtd: omap2 onenand: convert to mtd_device_register()
  mtd: txx9ndfmc: convert to mtd_device_register()
  mtd: tmio_nand: convert to mtd_device_register()
  mtd: socrates_nand: convert to mtd_device_register()
  mtd: sharpsl: convert to mtd_device_register()
  mtd: s3c2410 nand: convert to mtd_device_register()
  mtd: ppchameleonevb: convert to mtd_device_register()
  mtd: orion_nand: convert to mtd_device_register()
  mtd: omap2: convert to mtd_device_register()
  mtd: nomadik_nand: convert to mtd_device_register()
  mtd: ndfc: convert to mtd_device_register()
  mtd: mxc_nand: convert to mtd_device_register()
  mtd: mpc5121_nfc: convert to mtd_device_register()
  mtd: jz4740_nand: convert to mtd_device_register()
  mtd: h1910: convert to mtd_device_register()
  mtd: fsmc_nand: convert to mtd_device_register()
  ...

Fixed up trivial conflicts in
 - drivers/mtd/maps/integrator-flash.c: removed in ARM tree
 - drivers/mtd/maps/physmap.c: addition of afs partition probe type
   clashing with removal of CONFIG_MTD_PARTITIONS

diff --cc arch/blackfin/mach-bf537/boards/stamp.c
Simple merge

diff --cc arch/cris/Kconfig
Simple merge

diff --cc drivers/mtd/Kconfig
Simple merge

diff --cc drivers/mtd/maps/Kconfig
index 5069111,195b9ef..c0c328c
--- 1/drivers/mtd/maps/Kconfig
--- 2/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@@ -260,16 -257,9 +257,16 @@@ config MTD_BCM963X
          Support for parsing CFE image tag and creating MTD partitions on
          Broadcom BCM63xx boards.
  
 +config MTD_LANTIQ
 +      tristate "Lantiq SoC NOR support"
 +      depends on LANTIQ
 +      select MTD_PARTITIONS
 +      help
 +        Support for NOR flash attached to the Lantiq SoC's External Bus Unit.
 +
  config MTD_DILNETPC
        tristate "CFI Flash device mapped on DIL/Net PC"
-       depends on X86 && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
+       depends on X86 && MTD_CFI_INTELEXT && BROKEN
        help
          MTD map driver for SSV DIL/Net PC Boards "DNP" and "ADNP".
          For details, see <http://www.ssv-embedded.de/ssv/pc104/p169.htm>

diff --cc drivers/mtd/maps/pcmciamtd.c
Simple merge

diff --cc drivers/mtd/maps/physmap.c
index 1a9b94f,d205926..f64cee4
--- 1/drivers/mtd/maps/physmap.c
--- 2/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@@ -92,10 -65,7 +81,8 @@@ static const char *rom_probe_types[] = 
                                        "qinfo_probe",
                                        "map_rom",
                                        NULL };
- #ifdef CONFIG_MTD_PARTITIONS
 -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
 +static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "afs",
 +                                        NULL };
- #endif
  
  static int physmap_flash_probe(struct platform_device *dev)
  {

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

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

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

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