Conflicts: arch/x86/Kconfig block/blktrace.c kernel/irq/handle.c Semantic conflict: kernel/trace/blktrace.c Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
calibrate.c | ||
do_mounts.c | ||
do_mounts.h | ||
do_mounts_initrd.c | ||
do_mounts_md.c | ||
do_mounts_rd.c | ||
initramfs.c | ||
main.c | ||
noinitramfs.c | ||
version.c |