Merge branch 'perf/x86' into perf/core
authorIngo Molnar <mingo@elte.hu>
Fri, 12 Mar 2010 20:06:35 +0000 (21:06 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 12 Mar 2010 20:06:37 +0000 (21:06 +0100)
Merge reason: The new P4 driver is stable and ready now for more
              testing.

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

Simple merge