projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cba9bd2 d93dc5c)
Merge commit 'v3.1-rc7' into perf/core
authorIngo Molnar <mingo@elte.hu>
Mon, 26 Sep 2011 10:53:42 +0000 (12:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 26 Sep 2011 10:54:28 +0000 (12:54 +0200)
Merge reason: Pick up the latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/kernel/cpu/perf_event.c patch | diff1 | diff2 | blob | history
kernel/events/core.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/cpu/perf_event.c
Simple merge
diff --cc kernel/events/core.c
Simple merge