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
..
7segled.c
irq_tx3927.c
irq_tx4927.c	MIPS: Convert the irq functions to the new names	2011-03-29 14:48:07 +02:00
irq_tx4938.c	MIPS: Convert the irq functions to the new names	2011-03-29 14:48:07 +02:00
irq_tx4939.c	MIPS: Convert the irq functions to the new names	2011-03-29 14:48:07 +02:00
Makefile
mem_tx4927.c
pci.c
setup_tx3927.c
setup_tx4927.c
setup_tx4938.c
setup_tx4939.c	ethtool: Call ethtool's get/set_settings callbacks with cleaned data	2011-04-29 14:01:30 -07:00
setup.c	mips: tx99: remove CONFIG_MTD_PARTITIONS check	2011-05-25 02:21:14 +01:00
smsc_fdc37m81x.c
spi_eeprom.c