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)
commit70ca00db106297af0dbb88df9cc837d98cdc0c15
tree919f8157fa71b8f922f8692fdcd7a997077ac264
parentfaf3502a3fed9951ea9f5a696c0bd2c1d056d7b4
parent8c79a045fd590a26e81e75f5d8d4ec5c7d23e565
Merge branch 'sched-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/events: Revert trace_sched_stat_sleeptime()