projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e73453 215432e)
Merge branch 'perf/urgent' into perf/core to fix conflicts
authorIngo Molnar <mingo@kernel.org>
Mon, 4 Nov 2013 06:49:35 +0000 (07:49 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 4 Nov 2013 06:49:35 +0000 (07:49 +0100)
Conflicts:
tools/perf/bench/numa.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
include/uapi/linux/perf_event.h patch | diff1 | diff2 | blob | history

diff --cc include/uapi/linux/perf_event.h
Simple merge