| commit | 70ca00db106297af0dbb88df9cc837d98cdc0c15 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 27 07:55:39 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 27 07:55:39 2012 -0800 |
| tree | 919f8157fa71b8f922f8692fdcd7a997077ac264 | |
| parent | faf3502a3fed9951ea9f5a696c0bd2c1d056d7b4 [diff] | |
| parent | 8c79a045fd590a26e81e75f5d8d4ec5c7d23e565 [diff] |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/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()