Merge commit 'v2.6.37-rc3' into perf/core

author Ingo Molnar <mingo@elte.hu>

Fri, 26 Nov 2010 14:04:42 +0000 (15:04 +0100)

committer Ingo Molnar <mingo@elte.hu>

Fri, 26 Nov 2010 14:04:47 +0000 (15:04 +0100)
author Ingo Molnar <mingo@elte.hu>
Fri, 26 Nov 2010 14:04:42 +0000 (15:04 +0100)
committer Ingo Molnar <mingo@elte.hu>
Fri, 26 Nov 2010 14:04:47 +0000 (15:04 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc kernel/sysctl.c
Simple merge
diff --cc kernel/trace/trace.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Fri, 26 Nov 2010 14:04:42 +0000 (15:04 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 26 Nov 2010 14:04:47 +0000 (15:04 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	patch \|	diff1 \|	diff2 \|	blob \| history