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
..
acpi	ACPI: support acpi_device_ops .notify methods	2009-04-05 02:25:07 -04:00
asm-arm	S3C24XX: Move and update IIS headers	2009-03-05 12:00:59 +00:00
asm-frv	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
asm-generic	Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-04-05 11:04:19 -07:00
asm-h8300
asm-m32r	Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-04-05 11:04:19 -07:00
asm-mn10300	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
crypto	crypto: zlib - New zlib crypto module, using pcomp	2009-03-04 15:16:19 +08:00
drm	drm: remove unused "can_grow" parameter from drm_crtc_helper_initial_config	2009-04-03 10:21:44 +10:00
keys
linux	Merge git://git.infradead.org/mtd-2.6	2009-04-06 14:56:26 -07:00
math-emu
media	V4L/DVB (11313): v4l2-subdev: add enum_framesizes and enum_frameintervals.	2009-03-30 12:43:49 -03:00
mtd	make MTD headers use strict integer types	2009-03-26 18:14:17 +01:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-04-02 21:05:30 -07:00
pcmcia
rdma	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-03-26 15:54:36 -07:00
rxrpc
scsi	[SCSI] fcoe, libfcoe: Add support for FIP. FCoE discovery and keep-alive.	2009-04-03 09:23:08 -05:00
sound	V4L/DVB (10771): tea575x-tuner: convert it to V4L2 API	2009-03-30 12:43:02 -03:00
trace	kmemtrace: use tracepoints	2009-04-03 12:23:06 +02:00
video	fbdev: update s1d13xxxfb to differ between revisions and production ids	2009-04-01 08:59:32 -07:00
xen
Kbuild