Ingo Molnar 6d2e91bf80 Merge branch 'x86/urgent' into x86/mm ... Conflicts: arch/x86/include/asm/fixmap_64.h Semantic merge: arch/x86/include/asm/fixmap.h Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-03-04 20:20:10 +01:00
..
calibrate.c	x86: remove stray <6> in BogoMIPS printk	2008-07-28 14:22:26 +02:00
do_mounts_initrd.c	Freezer: Fix s2disk resume from initrd	2007-11-20 22:22:42 -05:00
do_mounts_md.c	Consolidate driver_probe_done() loops into one place	2009-02-21 14:17:17 -08:00
do_mounts_rd.c	init: make initrd/initramfs decompression failure a KERN_EMERG event	2009-01-14 11:28:35 -08:00
do_mounts.c	Consolidate driver_probe_done() loops into one place	2009-02-21 14:17:17 -08:00
do_mounts.h	make init/do_mounts.c:root_device_name static	2008-07-26 12:00:12 -07:00
initramfs.c	init: make initrd/initramfs decompression failure a KERN_EMERG event	2009-01-14 11:28:35 -08:00
Kconfig	Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x86/setup-lzma', 'x86/signal' and 'x86/urgent' into x86/core	2009-03-04 02:22:31 +01:00
main.c	Merge branch 'x86/urgent' into x86/mm	2009-03-04 20:20:10 +01:00
Makefile	kbuild: fix make V=1	2008-02-11 17:43:54 +01:00
noinitramfs.c	[PATCH] disable init/initramfs.c	2007-02-11 10:51:25 -08:00
version.c	init/version.c: define version_string only if CONFIG_KALLSYMS is not defined	2008-07-25 10:53:29 -07:00