Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

author Steven Rostedt <[email protected]>

Fri, 14 May 2010 13:29:52 +0000 (09:29 -0400)

committer Steven Rostedt <[email protected]>

Fri, 14 May 2010 13:29:52 +0000 (09:29 -0400)
author Steven Rostedt <[email protected]>
Fri, 14 May 2010 13:29:52 +0000 (09:29 -0400)
committer Steven Rostedt <[email protected]>
Fri, 14 May 2010 13:29:52 +0000 (09:29 -0400)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc kernel/module.c
Simple merge
diff --cc kernel/trace/ftrace.c
Simple merge
author	Steven Rostedt <[email protected]>
	Fri, 14 May 2010 13:29:52 +0000 (09:29 -0400)
committer	Steven Rostedt <[email protected]>
	Fri, 14 May 2010 13:29:52 +0000 (09:29 -0400)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/module.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/ftrace.c	patch \|	diff1 \|	diff2 \|	blob \| history