projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d81e5c de346b6)
Merge branch 'core' of git://amd64.org/linux/rric into perf/core
authorIngo Molnar <mingo@elte.hu>
Tue, 15 Nov 2011 10:05:18 +0000 (11:05 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 15 Nov 2011 10:05:18 +0000 (11:05 +0100)
1  2 
Documentation/kernel-parameters.txt patch | diff1 | diff2 | blob | history
arch/x86/oprofile/nmi_int.c patch | diff1 | diff2 | blob | history
kernel/events/core.c patch | diff1 | diff2 | blob | history

diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc arch/x86/oprofile/nmi_int.c
Simple merge
diff --cc kernel/events/core.c
Simple merge
Domain: System / Kernel;