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
..
include/mach	Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	14 years ago
Kconfig	…
Makefile	…
Makefile.boot	…
avila-pci.c	arm: Cleanup the irq namespace	14 years ago
avila-setup.c	…
common-pci.c	ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizes	14 years ago
common.c	clocksource: convert ARM 32-bit up counting clocksources	14 years ago
coyote-pci.c	arm: Cleanup the irq namespace	14 years ago
coyote-setup.c	…
dsmg600-pci.c	arm: Cleanup the irq namespace	14 years ago
dsmg600-setup.c	…
fsg-pci.c	arm: Cleanup the irq namespace	14 years ago
fsg-setup.c	…
gateway7001-pci.c	arm: Cleanup the irq namespace	14 years ago
gateway7001-setup.c	…
goramo_mlr.c	arm: Cleanup the irq namespace	14 years ago
gtwx5715-pci.c	arm: Cleanup the irq namespace	14 years ago
gtwx5715-setup.c	…
ixdp425-pci.c	arm: Cleanup the irq namespace	14 years ago
ixdp425-setup.c	mtd: ixp: convert to mtd_device_register()	14 years ago
ixdpg425-pci.c	arm: Cleanup the irq namespace	14 years ago
ixp4xx_npe.c	…
ixp4xx_qmgr.c	…
nas100d-pci.c	arm: Cleanup the irq namespace	14 years ago
nas100d-setup.c	…
nslu2-pci.c	arm: Cleanup the irq namespace	14 years ago
nslu2-setup.c	…
vulcan-pci.c	arm: Cleanup the irq namespace	14 years ago
vulcan-setup.c	…
wg302v2-pci.c	arm: Cleanup the irq namespace	14 years ago
wg302v2-setup.c	…