Merge branches 'tracing/ftrace' and 'linus' into tracing/core

author Ingo Molnar <mingo@elte.hu>

Wed, 18 Mar 2009 05:58:45 +0000 (06:58 +0100)

committer Ingo Molnar <mingo@elte.hu>

Wed, 18 Mar 2009 05:58:45 +0000 (06:58 +0100)
author Ingo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 05:58:45 +0000 (06:58 +0100)
committer Ingo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 05:58:45 +0000 (06:58 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/x86/kernel/tsc.c
Simple merge
diff --cc drivers/acpi/osl.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Wed, 18 Mar 2009 05:58:45 +0000 (06:58 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 18 Mar 2009 05:58:45 +0000 (06:58 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tsc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/osl.c	patch \|	diff1 \|	diff2 \|	blob \| history