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
..
include/mach	Merge git://git.infradead.org/mtd-2.6	2009-04-06 14:56:26 -07:00
board-evm.c	usb: musb: make Davinci *work* in mainline	2009-02-27 14:40:51 -08:00
clock.c	usb: musb: make Davinci *work* in mainline	2009-02-27 14:40:51 -08:00
clock.h	[ARM] 4430/1: davinci: clock control support	2007-07-12 09:57:09 +01:00
devices.c	[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c	2009-01-08 16:29:42 +00:00
gpio.c	Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git	2008-10-09 21:33:05 +01:00
id.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
io.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
irq.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
Kconfig	[ARM] 4303/3: base kernel support for TI DaVinci	2007-05-11 17:26:55 +01:00
Makefile	ARM: DaVinci: usb setup	2008-09-17 00:31:42 -07:00
Makefile.boot	[ARM] 4303/3: base kernel support for TI DaVinci	2007-05-11 17:26:55 +01:00
mux.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
psc.c	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-10-11 10:09:45 -07:00
serial.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
time.c	cpumask: convert struct clock_event_device to cpumask pointers.	2008-12-13 21:20:26 +10:30
usb.c	usb: musb: make Davinci *work* in mainline	2009-02-27 14:40:51 -08:00