| commit | b5bc0c7054725e238d1be6965fec452b0f0e5213 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 24 Aug 2012 04:46:57 +0000 (23 21:46 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 24 Aug 2012 04:46:57 +0000 (23 21:46 -0700) | ||
| tree | c92a6c31fb6eaec9ba5834a21a35e072b5d40db6 | treesnapshot (tar.gz zip) |
| parent | d37e44969e60dc652fdbaf4397d5436e07c967af | commitdiff |
| parent | bf2ac312195155511a0f79325515cbb61929898a | commitdiff |
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"Mostly small fixes for the fallout of the timekeeping overhaul in 3.6
along with stable fixes to address an accumulation problem and missing
sanity checks for RTC readouts and user space provided values."
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
time: Avoid making adjustments if we haven't accumulated anything
time: Avoid potential shift overflow with large shift values
time: Fix casting issue in timekeeping_forward_now
time: Ensure we normalize the timekeeper in tk_xtime_add
time: Improve sanity checking of timekeeping inputs
Pull timer fixes from Thomas Gleixner:
"Mostly small fixes for the fallout of the timekeeping overhaul in 3.6
along with stable fixes to address an accumulation problem and missing
sanity checks for RTC readouts and user space provided values."
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
time: Avoid making adjustments if we haven't accumulated anything
time: Avoid potential shift overflow with large shift values
time: Fix casting issue in timekeeping_forward_now
time: Ensure we normalize the timekeeper in tk_xtime_add
time: Improve sanity checking of timekeeping inputs