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.c	platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'	2009-03-24 16:38:25 -07:00
Kconfig	[MTD] [OneNAND] Add OMAP2 / OMAP3 OneNAND driver	2008-08-12 11:07:37 +01:00
Makefile	[MTD] [OneNAND] Add OMAP2 / OMAP3 OneNAND driver	2008-08-12 11:07:37 +01:00
omap2.c	[MTD] support driver model updates	2009-04-04 14:32:59 +01:00
onenand_base.c	[MTD] [OneNAND] Add write-while-program support	2009-03-23 15:14:46 +00:00
onenand_bbt.c
onenand_sim.c