projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3267382 058e297)
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@elte.hu>
Sun, 1 May 2011 17:09:39 +0000 (19:09 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 1 May 2011 17:09:39 +0000 (19:09 +0200)
1  2 
arch/x86/kernel/cpu/perf_event.c patch | diff1 | diff2 | blob | history
arch/x86/kernel/cpu/perf_event_p4.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/cpu/perf_event.c
Simple merge
diff --cc arch/x86/kernel/cpu/perf_event_p4.c
Simple merge
John Crispins staging tree