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
..
bitfield.h
efx.c
efx.h
enum.h
ethtool.c
falcon.c
falcon_boards.c
falcon_xmac.c
filter.c
filter.h
io.h
Kconfig
mac.h
Makefile
mcdi.c
mcdi.h
mcdi_mac.c
mcdi_pcol.h
mcdi_phy.c
mdio_10g.c
mdio_10g.h
mtd.c	mtd: convert remaining users to mtd_device_register()	2011-05-25 02:25:00 +01:00
net_driver.h
nic.c
nic.h
phy.h
qt202x_phy.c
regs.h
rx.c	Add appropriate <linux/prefetch.h> include for prefetch users	2011-05-22 21:41:57 -07:00
selftest.c
selftest.h
siena.c
spi.h
tenxpress.c
tx.c
txc43128_phy.c
workarounds.h