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> |
||
---|---|---|
.. | ||
Makefile | ||
autoprobe.c | ||
chip.c | ||
devres.c | ||
handle.c | ||
internals.h | ||
manage.c | ||
migration.c | ||
numa_migrate.c | ||
proc.c | ||
resend.c | ||
spurious.c |