Ingo Molnar 6e15cf0486 Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 ... Conflicts: arch/parisc/kernel/irq.c arch/x86/include/asm/fixmap_64.h arch/x86/include/asm/setup.h kernel/irq/handle.c Semantic merge: arch/x86/include/asm/fixmap.h Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-03-27 17:28:43 +01:00
..
chips	[MTD] map_rom has NULL erase pointer	2009-01-11 19:56:46 +00:00
devices	ps3/block: Replace mtd/ps3vram by block/ps3vram	2009-03-13 16:07:19 +11:00
lpddr	[MTD] [LPDDR] qinfo_probe depends on lpddr	2009-01-11 10:42:32 +00:00
maps	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2009-03-26 11:17:04 -07:00
nand	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
onenand	platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'	2009-03-24 16:38:25 -07:00
tests	[MTD] [TESTS] Fix some size_t printk format warnings	2009-01-05 16:31:03 +00:00
ubi	UBI: allow direct user-space I/O	2009-01-27 16:54:41 +02:00
Kconfig	Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6	2009-01-05 16:24:55 +00:00
Makefile	Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6	2009-01-05 16:24:55 +00:00
afs.c	MTD/JFFS2: remove CVS keywords	2008-06-04 17:50:17 +01:00
ar7part.c	[MTD] Clean up AR7 partition map support	2008-04-23 09:39:49 +01:00
cmdlinepart.c	[MTD] cmdlineparts documentation change - explain where mtd-id comes from	2008-10-18 12:43:03 +01:00
ftl.c	[MTD] Remove strange u_int32_t types from FTL	2008-12-10 14:06:42 +00:00
inftlcore.c	[MTD] update internal API to support 64-bit device size	2008-12-10 13:37:21 +00:00
inftlmount.c	[MTD] update internal API to support 64-bit device size	2008-12-10 13:37:21 +00:00
mtd_blkdevs.c	[PATCH] switch mtd_blkdevs	2008-10-21 07:48:38 -04:00
mtdblock.c	MTD/JFFS2: remove CVS keywords	2008-06-04 17:50:17 +01:00
mtdblock_ro.c	MTD/JFFS2: remove CVS keywords	2008-06-04 17:50:17 +01:00
mtdchar.c	[MTD] update internal API to support 64-bit device size	2008-12-10 13:37:21 +00:00
mtdconcat.c	mtd: struct device - replace bus_id with dev_name(), dev_set_name()	2009-01-06 10:44:38 -08:00
mtdcore.c	[MTD] update internal API to support 64-bit device size	2008-12-10 13:37:21 +00:00
mtdcore.h	[MTD] mtdcore.c: share syms with mtd_blkdev.c	2007-06-28 20:24:50 +01:00
mtdoops.c	[MTD] update internal API to support 64-bit device size	2008-12-10 13:37:21 +00:00
mtdpart.c	[MTD] update internal API to support 64-bit device size	2008-12-10 13:37:21 +00:00
mtdsuper.c	[MTD] Fix !CONFIG_BLOCK compile for mtdsuper.c	2008-08-02 07:52:39 +01:00
nftlcore.c	[MTD] update internal API to support 64-bit device size	2008-12-10 13:37:21 +00:00
nftlmount.c	[MTD] update internal API to support 64-bit device size	2008-12-10 13:37:21 +00:00
ofpart.c	[MTD] remove unused mtd parameter in of_mtd_parse_partitions()	2008-10-13 15:01:42 +01:00
redboot.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-07-11 14:36:25 +01:00
rfd_ftl.c	[MTD] remove private wrapper of endian helpers in rfd_ftl.c	2008-12-10 15:39:09 +00:00
ssfdc.c	[MTD] update internal API to support 64-bit device size	2008-12-10 13:37:21 +00:00