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
..
executive	Fix common misspellings	14 years ago
Kconfig	MIPS: Octeon: Guard the Kconfig body with CPU_CAVIUM_OCTEON	14 years ago
Makefile	MIPS: Octeon: Migrate to new platform makefile style.	15 years ago
Platform	MIPS: Octeon: Migrate to new platform makefile style.	15 years ago
cpu.c	MIPS: Octeon: Place cnmips_cu2_setup in __init memory.	15 years ago
csrc-octeon.c	mips: convert to clocksource_register_hz/khz	14 years ago
dma-octeon.c	MIPS: Octeon: Rewrite DMA mapping functions.	14 years ago
flash_setup.c	mtd: octeon: convert to mtd_device_register()	14 years ago
octeon-irq.c	MIPS: Octeon: Simplify irq_cpu_on/offline irq chip functions	14 years ago
octeon-memcpy.S	…
octeon-platform.c	Fix common misspellings	14 years ago
octeon_boot.h	MIPS: Octeon: HOTPLUG_CPU fixes.	15 years ago
serial.c	MIPS: Octeon: Use I/O clock rate for calculations.	14 years ago
setup.c	Octeon: Fix interrupt irq settings for performance counters.	14 years ago
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	14 years ago