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
board-rut1xx.c
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
devices.c
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
Makefile
Makefile.boot
mm.c
time.c