Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Fri, 26 Nov 2010 14:07:02 +0000 (15:07 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 26 Nov 2010 14:07:02 +0000 (15:07 +0100)
commit6c869e772c72d509d0db243a56c205ef48a29baf
tree9a290f1742526a8816f94560cb09bc0a09c910de
parente4e91ac410356da3a518188f371e9d3b52ee38ee
parentee6dcfa40a50fe12a3ae0fb4d2653c66c3ed6556
Merge branch 'perf/urgent' into perf/core

Conflicts:
arch/x86/kernel/apic/hw_nmi.c

Merge reason: Resolve conflict, queue up dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/apic/hw_nmi.c
arch/x86/kernel/cpu/perf_event.c
kernel/perf_event.c
tools/perf/builtin-record.c