Ingo Molnar cb28a1bbdb Merge branch 'linus' into core/generic-dma-coherent ...

Conflicts:

	arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2008-07-29 00:07:55 +02:00

..

calibrate.c

…

do_mounts_initrd.c

…

do_mounts_md.c

…

do_mounts_rd.c

…

do_mounts.c

make init/do_mounts.c:root_device_name static

2008-07-26 12:00:12 -07:00

do_mounts.h

make init/do_mounts.c:root_device_name static

2008-07-26 12:00:12 -07:00

initramfs.c

…

Kconfig

Merge branch 'linus' into core/generic-dma-coherent

2008-07-29 00:07:55 +02:00

main.c

Full conversion to early_initcall() interface, remove old interface

2008-07-26 12:00:04 -07:00

Makefile

…

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