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)
commit23e117fa44429cc054cb27d5621d64e4ced91e52
treea4b9d0902b9c6f009b2c297515221c1b9bed3af8
parent668eb65f092902eb7dd526af73d4a7f025a94612
parenta93d2f1744206827ccf416e2cdc5018aa503314e
Merge branch 'sched/core' of git://git./linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-4
Documentation/kernel-parameters.txt
kernel/module.c
kernel/trace/ftrace.c