Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Feb 2012 15:55:39 +0000 (07:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Feb 2012 15:55:39 +0000 (07:55 -0800)
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/events: Revert trace_sched_stat_sleeptime()


Trivial merge