]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
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)
Merge reason: update to latest tracing and ptrace APIs

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

Simple merge
Simple merge
Simple merge
Simple merge