Merge branch 'linus' into tracing/hw-branch-tracing
authorIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 11:34:26 +0000 (13:34 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 11:34:42 +0000 (13:34 +0200)
commit2e8844e13ab73f1107aea4317a53ff5879f2e1d7
tree36165371cf6fd26d674610f1c6bb5fac50e6e13f
parentc78a3956b982418186e40978a51636a2b43221bc
parentd508afb437daee7cf07da085b635c44a4ebf9b38
Merge branch 'linus' into tracing/hw-branch-tracing

Merge reason: update to latest tracing and ptrace APIs

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Kconfig.debug
arch/x86/kernel/Makefile
kernel/trace/trace.h
kernel/trace/trace_selftest.c