Merge branch 'linus' into tracing/blktrace

Conflicts:
	block/blktrace.c

Semantic merge:
	kernel/trace/blktrace.c

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

diff --cc MAINTAINERS
Simple merge

diff --cc include/linux/blktrace_api.h
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/trace/blktrace.c
Simple merge