commit | ecff4fcc7bbaf060646d2160123f8dc02605a047 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 07 19:07:22 2011 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 07 19:07:22 2011 -0700 |
tree | 5b9bb75529804ebd258ced9d24fb8e6881b3f5be | |
parent | 58a9a36b5444cbd921cdfc8ddd344d9983cc2c7b [diff] | |
parent | 1c3cc11602111d1318c2a5743bd2e88c82813927 [diff] |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: timers: Consider slack value in mod_timer() clockevents: Handle empty cpumask gracefully