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

* git://git.infradead.org/mtd-2.6: (53 commits)
  [MTD] struct device - replace bus_id with dev_name(), dev_set_name()
  [MTD] [NOR] Fixup for Numonyx M29W128 chips
  [MTD] mtdpart: Make ecc_stats more realistic.
  powerpc/85xx: TQM8548: Update DTS file for multi-chip support
  powerpc: NAND: FSL UPM: document new bindings
  [MTD] [NAND] FSL-UPM: Add wait flags to support board/chip specific delays
  [MTD] [NAND] FSL-UPM: add multi chip support
  [MTD] [NOR] Add device parent info to physmap_of
  [MTD] [NAND] Add support for NAND on the Socrates board
  [MTD] [NAND] Add support for 4KiB pages.
  [MTD] sysfs support should not depend on CONFIG_PROC_FS
  [MTD] [NAND] Add parent info for CAFÉ controller
  [MTD] support driver model updates
  [MTD] driver model updates (part 2)
  [MTD] driver model updates
  [MTD] [NAND] move gen_nand's probe function to .devinit.text
  [MTD] [MAPS] move sa1100 flash's probe function to .devinit.text
  [MTD] fix use after free in register_mtd_blktrans
  [MTD] [MAPS] Drop now unused sharpsl-flash map
  [MTD] ofpart: Check name property to determine partition nodes.
  ...

Manually fix trivial conflict in drivers/mtd/maps/Makefile

diff --cc arch/blackfin/kernel/process.c
Simple merge

diff --cc arch/powerpc/boot/dts/tqm8548-bigflash.dts
Simple merge

diff --cc arch/powerpc/boot/dts/tqm8548.dts
Simple merge

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

diff --cc drivers/mtd/maps/Makefile
index 26b28a7a90b5e19a57baf21502d2dd94fdc349a7,ba62013485a78e490eb614584b96448ce608cc17..2dbc1bec848808559f4bc52995eda5ee06fb8dad
--- 1/drivers/mtd/maps/Makefile
--- 2/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@@ -61,4 -60,4 +60,5 @@@ obj-$(CONFIG_MTD_PLATRAM)     += plat-ram.
  obj-$(CONFIG_MTD_OMAP_NOR)    += omap_nor.o
  obj-$(CONFIG_MTD_INTEL_VR_NOR)        += intel_vr_nor.o
  obj-$(CONFIG_MTD_BFIN_ASYNC)  += bfin-async-flash.o
+ obj-$(CONFIG_MTD_RBTX4939)    += rbtx4939-flash.o
 +obj-$(CONFIG_MTD_VMU)         += vmu-flash.o

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

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

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

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

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

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