OSDN Git Service

(root) / android-x86 / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83b8450 c5905af)
Merge branch 'perf/jump-labels' into perf/core
authorIngo Molnar <mingo@elte.hu>
Tue, 28 Feb 2012 18:59:45 +0000 (19:59 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 28 Feb 2012 18:59:47 +0000 (19:59 +0100)
Merge reason: After much naming discussion, there seems to be consensus
              now - queue it up for v3.4.

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

diff --cc include/linux/perf_event.h
Simple merge
kernel
About OSDN
Find Software
Develop Software
Help