Merge branch 'perf/urgent' into perf/stat
commit7bd5fafeb414cf00deee32c82834f8bf1426b9ac
authorIngo Molnar <mingo@elte.hu>
Tue, 26 Apr 2011 17:36:14 +0000 (26 19:36 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 26 Apr 2011 17:36:17 +0000 (26 19:36 +0200)
tree1103053fa40576e9f9fc2818ea1910180e09b752
parentfa7b69475a6c192853949ba496dd9c37b497b548
parentec75a71634dabe439db91c1ef51d5099f4493808
Merge branch 'perf/urgent' into perf/stat

Merge reason: We want to queue up dependent changes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event_p4.c