linux/init
Ingo Molnar a1413c89ae Merge branch 'x86/urgent' into x86/core
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-05 21:48:50 +01:00
..
calibrate.c
do_mounts.c
do_mounts.h
do_mounts_initrd.c
do_mounts_md.c
do_mounts_rd.c
initramfs.c
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/core 2009-03-05 21:48:50 +01:00
Makefile
noinitramfs.c
version.c