commit | c28800a9c3caaf387d85ac665a25ebe99e480295 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 28 08:43:52 2011 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 28 08:43:52 2011 -0800 |
tree | 401ba805709a65a9f5c1919b3dc763c70b64b38f | |
parent | ce8f55c2a0ff652480c12a4f1f22ff5ce15e3a22 [diff] | |
parent | 27c9cd7e601632b3794e1c3344d37b86917ffb43 [diff] |
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()