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
..
executive	Fix common misspellings	2011-03-31 11:26:23 -03:00
cpu.c	MIPS: Octeon: Place cnmips_cu2_setup in __init memory.	2010-10-04 18:34:00 +01:00
csrc-octeon.c	mips: convert to clocksource_register_hz/khz	2011-02-21 13:33:50 -08:00
dma-octeon.c	MIPS: Octeon: Rewrite DMA mapping functions.	2010-10-29 19:08:32 +01:00
flash_setup.c	mtd: octeon: convert to mtd_device_register()	2011-05-25 02:21:11 +01:00
Kconfig	MIPS: Octeon: Guard the Kconfig body with CPU_CAVIUM_OCTEON	2011-05-10 18:15:24 +01:00
Makefile	MIPS: Octeon: Migrate to new platform makefile style.	2010-08-05 13:25:54 +01:00
octeon_boot.h	MIPS: Octeon: HOTPLUG_CPU fixes.	2010-08-05 13:26:12 +01:00
octeon-irq.c	MIPS: Octeon: Simplify irq_cpu_on/offline irq chip functions	2011-03-29 14:48:07 +02:00
octeon-memcpy.S	MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon.	2009-01-11 09:57:21 +00:00
octeon-platform.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
Platform	MIPS: Octeon: Migrate to new platform makefile style.	2010-08-05 13:25:54 +01:00
serial.c	MIPS: Octeon: Use I/O clock rate for calculations.	2010-10-29 19:08:41 +01:00
setup.c	Octeon: Fix interrupt irq settings for performance counters.	2011-05-19 09:55:49 +01:00
smp.c	Merge branches 'sched-core-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-19 17:41:22 -07:00