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)
commit0308635917273030db6121d67c41ef2279b30340
treef65e386905199f7a1060119c53a51eb15c32b8e6
parent3997d3776a6e89586e76a0ef355bfbbd8a76966c
parent0b861225a5890f22445f08ca9cc7a87cff276ff7
Merge branch 'perf/x86' into perf/core

Merge reason: The new P4 driver is stable and ready now for more
              testing.

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