Merge branch 'linus' into tracing/core

Merge reason: Pick up kernel/softirq.c update for dependent fix.

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

diff --cc Documentation/trace/events.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

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