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
..
include/mach	Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-25 08:59:42 -07:00
avila-pci.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
avila-setup.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
common-pci.c	ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizes	2011-05-12 08:36:53 +01:00
common.c	clocksource: convert ARM 32-bit up counting clocksources	2011-05-23 18:04:51 +01:00
coyote-pci.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
coyote-setup.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
dsmg600-pci.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
dsmg600-setup.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
fsg-pci.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
fsg-setup.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
gateway7001-pci.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
gateway7001-setup.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
goramo_mlr.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
gtwx5715-pci.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
gtwx5715-setup.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
ixdp425-pci.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
ixdp425-setup.c	mtd: ixp: convert to mtd_device_register()	2011-05-25 02:20:41 +01:00
ixdpg425-pci.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
ixp4xx_npe.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ixp4xx_qmgr.c	IXP4xx: Fix qmgr_release_queue() flushing unexpected queue entries.	2011-02-06 16:49:48 +01:00
Kconfig	ixp4xx: base support for Arcom Vulcan	2010-05-27 13:02:42 +02:00
Makefile	ixp4xx/vulcan: add PCI support	2010-05-27 13:02:42 +02:00
Makefile.boot	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
nas100d-pci.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
nas100d-setup.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
nslu2-pci.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
nslu2-setup.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
vulcan-pci.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
vulcan-setup.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
wg302v2-pci.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
wg302v2-setup.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00