Conflicts:
	block/blktrace.c

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