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	sfc: Don't use enums as a bitmask.	2011-05-17 17:53:22 -04:00
efx.h	sfc: Don't use enums as a bitmask.	2011-05-17 17:53:22 -04:00
enum.h
ethtool.c	sfc: Don't use enums as a bitmask.	2011-05-17 17:53:22 -04:00
falcon.c
falcon_boards.c
falcon_xmac.c
filter.c
filter.h
io.h
Kconfig
mac.h
Makefile
mcdi.c	sfc: Always map MCDI shared memory as uncacheable	2011-05-12 15:16:32 +01:00
mcdi.h
mcdi_mac.c
mcdi_pcol.h
mcdi_phy.c	ethtool: cosmetic: Use ethtool ethtool_cmd_speed API	2011-04-29 14:03:01 -07:00
mdio_10g.c	sfc: Don't use enums as a bitmask.	2011-05-17 17:53:22 -04:00
mdio_10g.h	sfc: Don't use enums as a bitmask.	2011-05-17 17:53:22 -04:00
mtd.c	mtd: convert remaining users to mtd_device_register()	2011-05-25 02:25:00 +01:00
net_driver.h	sfc: Don't use enums as a bitmask.	2011-05-17 17:53:22 -04:00
nic.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-05-17 17:33:11 -04:00
nic.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-05-17 17:33:11 -04:00
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	sfc: Use netif_device_{detach,attach}() around reset and self-test	2011-05-16 23:34:28 +01:00
selftest.h
siena.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-05-17 17:33:11 -04:00
spi.h
tenxpress.c	ethtool: cosmetic: Use ethtool ethtool_cmd_speed API	2011-04-29 14:03:01 -07:00
tx.c	sfc: Use netif_device_{detach,attach}() around reset and self-test	2011-05-16 23:34:28 +01:00
txc43128_phy.c
workarounds.h