]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jun 2011 02:07:22 +0000 (19:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jun 2011 02:07:22 +0000 (19:07 -0700)
commitecff4fcc7bbaf060646d2160123f8dc02605a047
tree5b9bb75529804ebd258ced9d24fb8e6881b3f5be
parent58a9a36b5444cbd921cdfc8ddd344d9983cc2c7b
parent1c3cc11602111d1318c2a5743bd2e88c82813927
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