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
..
clock.h
common.h	ARM: DaVinci: usb setup	2008-09-17 00:31:42 -07:00
debug-macro.S
entry-macro.S
gpio.h	[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c	2009-01-08 16:29:42 +00:00
hardware.h
i2c.h	ARM: DaVinci: i2c setup	2008-09-17 00:31:42 -07:00
io.h	[ARM] Add a common typesafe __io implementation	2008-11-30 11:45:54 +00:00
irqs.h
memory.h	[ARM] Ensure that both MAX_DMA_ADDRESS and ISA_DMA_THRESHOLD are defined	2008-11-30 13:26:47 +00:00
mux.h
nand.h	[MTD] [NAND] davinci_nand driver	2009-03-20 12:32:19 +00:00
psc.h
serial.h
system.h	[ARM] pass reboot command line to arch_reset()	2009-03-19 16:20:24 +00:00
timex.h
uncompress.h
vmalloc.h	[ARM] davinci: asm/memory.h is not required for mach/vmalloc.h	2008-11-30 14:42:43 +00:00