]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Nov 2011 16:43:52 +0000 (08:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Nov 2011 16:43:52 +0000 (08:43 -0800)
commitc28800a9c3caaf387d85ac665a25ebe99e480295
tree401ba805709a65a9f5c1919b3dc763c70b64b38f
parentce8f55c2a0ff652480c12a4f1f22ff5ce15e3a22
parent27c9cd7e601632b3794e1c3344d37b86917ffb43
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  hrtimer: Fix extra wakeups from __remove_hrtimer()
  timekeeping: add arch_offset hook to ktime_get functions
  clocksource: Avoid selecting mult values that might overflow when adjusted
  time: Improve documentation of timekeeeping_adjust()
kernel/hrtimer.c