]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 05:58:45 +0000 (06:58 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 05:58:45 +0000 (06:58 +0100)
1  2 
MAINTAINERS
arch/x86/kernel/tsc.c
drivers/acpi/osl.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge