Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 05:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
e480158cc8
linux/arch/blackfin/mach-bf537/boards
History
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
..
cm_bf537e.c Blackfin: use proper wrapper functions for modifying irq status 2011-03-18 04:01:08 -04:00
cm_bf537u.c Blackfin: use proper wrapper functions for modifying irq status 2011-03-18 04:01:08 -04:00
dnp5370.c Blackfin: dnp5370: drop MMC card detect support 2011-03-18 03:49:25 -04:00
Kconfig Blackfin: DNP5370: new board port 2011-01-10 07:18:25 -05:00
Makefile Blackfin: DNP5370: new board port 2011-01-10 07:18:25 -05:00
minotaur.c Blackfin: boards: add missing "static" to peripheral lists 2011-01-10 07:18:25 -05:00
pnav10.c Blackfin: boards: add missing "static" to peripheral lists 2011-01-10 07:18:25 -05:00
stamp.c Merge git://git.infradead.org/mtd-2.6 2011-05-27 20:06:53 -07:00
tcm_bf537.c Blackfin: use proper wrapper functions for modifying irq status 2011-03-18 04:01:08 -04:00