Ingo Molnar f541ae326f Merge branch 'linus' into perfcounters/core-v2 ... Merge reason: we have gathered quite a few conflicts, need to merge upstream Conflicts: arch/powerpc/kernel/Makefile arch/x86/ia32/ia32entry.S arch/x86/include/asm/hardirq.h arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/cpu/common.c arch/x86/kernel/irq.c arch/x86/kernel/syscall_table_32.S arch/x86/mm/iomap_32.c include/linux/sched.h kernel/Makefile Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-04-06 09:02:57 +02:00
..
calibrate.c	x86: remove stray <6> in BogoMIPS printk	2008-07-28 14:22:26 +02:00
do_mounts.c	Get rid of indirect include of fs_struct.h	2009-03-31 23:00:27 -04:00
do_mounts.h	md: move lots of #include lines out of .h files and into .c	2009-03-31 14:33:13 +11:00
do_mounts_initrd.c
do_mounts_md.c	md: move lots of #include lines out of .h files and into .c	2009-03-31 14:33:13 +11:00
do_mounts_rd.c	init: make initrd/initramfs decompression failure a KERN_EMERG event	2009-01-14 11:28:35 -08:00
initramfs.c	initramfs: prevent initramfs printk message being split by messages from other code.	2009-04-02 19:04:51 -07:00
Kconfig	Merge branch 'linus' into perfcounters/core-v2	2009-04-06 09:02:57 +02:00
main.c	Merge branch 'tracing/core-v2' into tracing-for-linus	2009-04-02 00:49:02 +02:00
Makefile	kbuild: fix make V=1	2008-02-11 17:43:54 +01:00
noinitramfs.c
version.c	init/version.c: define version_string only if CONFIG_KALLSYMS is not defined	2008-07-25 10:53:29 -07:00