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
..
generic	[MTD] [NAND] TXx9: add NDFMC support	2009-03-20 18:07:39 +00:00
jmr3927	MIPS: TXx9: IOC LED support	2008-10-11 16:18:49 +01:00
rbtx4927	MIPS: RBTX4927: Add GPIO-LED support	2008-10-30 14:44:33 +00:00
rbtx4938	[MTD] [NAND] TXx9: add NDFMC support	2009-03-20 18:07:39 +00:00
rbtx4939	[MTD] RBTX4939: add MTD support	2009-03-20 18:09:54 +00:00
Kconfig	MIPS: Enable GENERIC_HARDIRQS_NO__DO_IRQ for all platforms	2009-03-30 14:49:44 +02:00