Conflicts:
	arch/x86/Kconfig
	block/blktrace.c
	kernel/irq/handle.c

Semantic conflict:
	kernel/trace/blktrace.c
Signed-off-by: NIngo Molnar <mingo@elte.hu>