Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 18:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
c149f6c8ae
linux/arch/arm/mach-gemini
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
..
include/mach ARM: zImage: remove the static qualifier from global data variables 2011-05-07 00:08:02 -04:00
board-nas4220b.c ARM: 6604/1: Gemini: add platform support for Gemini RTC 2011-01-24 17:23:30 +00:00
board-rut1xx.c ARM: 6604/1: Gemini: add platform support for Gemini RTC 2011-01-24 17:23:30 +00:00
board-wbd111.c arm: mtd: gemini: convert to mtd_device_register() 2011-05-25 02:20:37 +01:00
board-wbd222.c arm: mtd: gemini: convert to mtd_device_register() 2011-05-25 02:20:37 +01:00
common.h ARM: 6604/1: Gemini: add platform support for Gemini RTC 2011-01-24 17:23:30 +00:00
devices.c ARM: 6604/1: Gemini: add platform support for Gemini RTC 2011-01-24 17:23:30 +00:00
gpio.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
irq.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
Kconfig ARM: 6130/1: Gemini: add support for Raidsonic IB4220 2010-05-13 12:19:14 +01:00
Makefile ARM: 6130/1: Gemini: add support for Raidsonic IB4220 2010-05-13 12:19:14 +01:00
Makefile.boot ARM: Add Gemini architecture v3 2009-03-26 10:06:08 +02:00
mm.c ARM: Add Gemini architecture v3 2009-03-26 10:06:08 +02:00
time.c ARM: Add Gemini architecture v3 2009-03-26 10:06:08 +02:00