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)
commit809435ff4f43a5c0cb0201b3b89176253d5ade18
tree607d673c02117656a956b54dd2bb80fe94edea61
parent32673822e440eb92eb334631eb0a199d0c532d13
parent058e297d34a404caaa5ed277de15698d8dc43000
Merge branch 'tip/perf/urgent' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/core
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event_p4.c