]> git.karo-electronics.de Git - karo-tx-linux.git/commit
manual merge of perf/kprobes
authorIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 11:54:28 +0000 (13:54 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 11:54:28 +0000 (13:54 +0200)
commit0fe4e1ee6231c07f3749fc87323b32378651b849
tree8e161a7ff4cef3820251575b5edbee5930cf9d01
parentd288430b7d45043dae1c7217fcea2e0a43f7eb08
parent69902c718c0b476e94ed7fccd3cf29ca39fe433a
manual merge of perf/kprobes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/apic/hw_nmi.c
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/traps.c
kernel/sched/core.c