Merge branch 'linus' into tracing/urgent

Conflicts:
	kernel/trace/trace_kprobe.c

Merge reason: resolve the conflict.

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

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

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

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