Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
Ingo Molnar [Sun, 1 May 2011 17:09:39 +0000 (19:09 +0200)]
1  2 
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event_p4.c

Simple merge
Simple merge