You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		14 years ago
..
Kconfig	…
Makefile	…
bitfield.h	…
efx.c	sfc: Don't use enums as a bitmask.	14 years ago
efx.h	sfc: Don't use enums as a bitmask.	14 years ago
enum.h	…
ethtool.c	sfc: Don't use enums as a bitmask.	14 years ago
falcon.c	…
falcon_boards.c	…
falcon_xmac.c	…
filter.c	…
filter.h	…
io.h	…
mac.h	…
mcdi.c	sfc: Always map MCDI shared memory as uncacheable	14 years ago
mcdi.h	…
mcdi_mac.c	…
mcdi_pcol.h	…
mcdi_phy.c	ethtool: cosmetic: Use ethtool ethtool_cmd_speed API	14 years ago
mdio_10g.c	sfc: Don't use enums as a bitmask.	14 years ago
mdio_10g.h	sfc: Don't use enums as a bitmask.	14 years ago
mtd.c	mtd: convert remaining users to mtd_device_register()	14 years ago
net_driver.h	sfc: Don't use enums as a bitmask.	14 years ago
nic.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	14 years ago
nic.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	14 years ago
phy.h	…
qt202x_phy.c	…
regs.h	…
rx.c	Add appropriate <linux/prefetch.h> include for prefetch users	14 years ago
selftest.c	sfc: Use netif_device_{detach,attach}() around reset and self-test	14 years ago
selftest.h	…
siena.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	14 years ago
spi.h	…
tenxpress.c	ethtool: cosmetic: Use ethtool ethtool_cmd_speed API	14 years ago
tx.c	sfc: Use netif_device_{detach,attach}() around reset and self-test	14 years ago
txc43128_phy.c	…
workarounds.h	…