Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...
authorSteven Rostedt <srostedt@redhat.com>
Fri, 14 May 2010 13:29:52 +0000 (09:29 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Fri, 14 May 2010 13:29:52 +0000 (09:29 -0400)

Trivial merge