commit | 23e117fa44429cc054cb27d5621d64e4ced91e52 | [log] [tgz] |
---|---|---|
author | Steven Rostedt <srostedt@redhat.com> | Fri May 14 09:29:52 2010 -0400 |
committer | Steven Rostedt <rostedt@goodmis.org> | Fri May 14 09:29:52 2010 -0400 |
tree | a4b9d0902b9c6f009b2c297515221c1b9bed3af8 | |
parent | 668eb65f092902eb7dd526af73d4a7f025a94612 [diff] | |
parent | a93d2f1744206827ccf416e2cdc5018aa503314e [diff] |
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-4