linux-stable/arch/mips/txx9
Linus Torvalds 29a6ccca38 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
2011-05-27 20:06:53 -07:00
..
generic Merge git://git.infradead.org/mtd-2.6 2011-05-27 20:06:53 -07:00
jmr3927 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
rbtx4927 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
rbtx4938 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
rbtx4939 MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
Kconfig MIPS: TXx9: Add ACLC support 2009-06-17 11:06:25 +01:00
Makefile MIPS: TXx9: Migrate to new platform makefile style. 2010-08-05 13:25:55 +01:00
Platform MIPS: TXx9: Migrate to new platform makefile style. 2010-08-05 13:25:55 +01:00