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)
* '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()

1  2 
kernel/hrtimer.c

Simple merge