git.samba.org - sfrench/cifs-2.6.git/commit

Merge branch 'perf/urgent' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Unnamed repository; edit this file 'description' to name the repository.

include/linux/trace_events.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_kprobe.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_probe.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_uprobe.c	diff1 \|	diff2 \|	blob \| history
tools/include/uapi/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history