Conflicts:
	kernel/trace/trace_kprobe.c

Merge reason: resolve the conflict.
Signed-off-by: NIngo Molnar <mingo@elte.hu>