Merge branch 'unlikely/sched' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into sched/urgent

This commit is contained in:
Ingo Molnar 2011-06-03 10:27:47 +02:00
commit e197f094b7
2 changed files with 4 additions and 4 deletions