projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit2a3ede8cb2ddee5885518e4232aca13056f9a6e0
tree79b2b4e060a97b1e7c60d58549f8c97cb15db5ddtree | snapshot (tar.gz zip)
parent0e73453e172aaa38fd59fd4d3fc589e8fc9b9a70commit | diff
parent215432ed30393ed4a8f77db0a1fe34523c48cdbacommit | diff
Merge branch 'perf/urgent' into perf/core to fix conflicts

Conflicts:
tools/perf/bench/numa.c

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