1
linux/arch/blackfin/mach-bf561/boards
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
..
acvilon.c mtd: bfin: convert to mtd_device_register() 2011-05-25 02:20:59 +01:00
cm_bf561.c Blackfin: use proper wrapper functions for modifying irq status 2011-03-18 04:01:08 -04:00
ezkit.c Blackfin: bf548-ezkit/bf561-ezkit: update nor flash layout 2011-05-25 08:24:09 -04:00
Kconfig Blackfin: add support for the Acvilon BF561 board 2009-12-15 00:15:10 -05:00
Makefile Blackfin: add support for the Acvilon BF561 board 2009-12-15 00:15:10 -05:00
tepla.c Blackfin: boards: add missing "static" to peripheral lists 2011-01-10 07:18:25 -05:00