Linus Torvalds 22ae77bc7a Merge git://git.infradead.org/mtd-2.6 ... * git://git.infradead.org/mtd-2.6: (53 commits) [MTD] struct device - replace bus_id with dev_name(), dev_set_name() [MTD] [NOR] Fixup for Numonyx M29W128 chips [MTD] mtdpart: Make ecc_stats more realistic. powerpc/85xx: TQM8548: Update DTS file for multi-chip support powerpc: NAND: FSL UPM: document new bindings [MTD] [NAND] FSL-UPM: Add wait flags to support board/chip specific delays [MTD] [NAND] FSL-UPM: add multi chip support [MTD] [NOR] Add device parent info to physmap_of [MTD] [NAND] Add support for NAND on the Socrates board [MTD] [NAND] Add support for 4KiB pages. [MTD] sysfs support should not depend on CONFIG_PROC_FS [MTD] [NAND] Add parent info for CAFÉ controller [MTD] support driver model updates [MTD] driver model updates (part 2) [MTD] driver model updates [MTD] [NAND] move gen_nand's probe function to .devinit.text [MTD] [MAPS] move sa1100 flash's probe function to .devinit.text [MTD] fix use after free in register_mtd_blktrans [MTD] [MAPS] Drop now unused sharpsl-flash map [MTD] ofpart: Check name property to determine partition nodes. ... Manually fix trivial conflict in drivers/mtd/maps/Makefile		2009-04-06 14:56:26 -07:00
..
boot	kbuild: use KECHO convenience echo	2008-12-03 21:32:01 +01:00
configs	Blackfin arch: update default kernel configuration	2009-03-28 23:46:17 +08:00
include/asm	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
kernel	Merge git://git.infradead.org/mtd-2.6	2009-04-06 14:56:26 -07:00
lib	Blackfin arch: merge adeos blackfin part to arch/blackfin/	2009-01-07 23:14:39 +08:00
mach-bf518	Blackfin arch: add RSI's definitions to bf514 and bf516	2009-03-29 01:03:20 +08:00
mach-bf527	Blackfin arch: convert BF5{18,27,48}_FAMILY to CONFIG_BF{51,52,54}x	2009-03-28 20:32:57 +08:00
mach-bf533	Blackfin arch: SPI_MMC is now mainlined MMC_SPI	2009-03-06 00:27:57 +08:00
mach-bf537	Blackfin arch: add sport-spi related resource stuff to board file	2009-03-28 23:28:51 +08:00
mach-bf538	Blackfin arch: add stubs for anomalies 447 and 448	2009-03-06 00:20:49 +08:00
mach-bf548	Blackfin arch: convert BF5{18,27,48}_FAMILY to CONFIG_BF{51,52,54}x	2009-03-28 20:32:57 +08:00
mach-bf561	Blackfin arch: SPI_MMC is now mainlined MMC_SPI	2009-03-06 00:27:57 +08:00
mach-common	Blackfin arch: Blacklist Hibernate (PM_SUSPEND_MEM) on BF561 as well	2009-03-28 23:14:41 +08:00
mm	proc 2/2: remove struct proc_dir_entry::owner	2009-03-31 01:14:44 +04:00
oprofile	Blackfin arch: remove hardware PM code, oprofile not use it	2009-01-07 23:14:39 +08:00
Kconfig	trivial: fix typos/grammar errors in Kconfig texts	2009-03-30 15:22:01 +02:00
Kconfig.debug	Blackfin arch: use common KGDB_TESTS rather than our own KGDB_TESTCASE	2009-03-02 18:14:47 +08:00
Makefile	Blackfin arch: line up machine-/cpu- vars after BF54xM addition	2009-02-04 16:49:45 +08:00