diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-03 10:58:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-03 10:58:57 -0700 |
| commit | ddc5057c1c1fb3e99afeeef45d2b8ff9597e6707 (patch) | |
| tree | 801e4842f3a4dce2d777336b54f3caf075975025 /net | |
| parent | fcc1d2a9cea4ba97c9800e1de0748003bba07335 (diff) | |
| parent | 4e250fdde9be50581c7dd5fed88c9b9960615314 (diff) | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Ingo Molnar:
"One regression fix, and a couple of cleanups that clean up the code
flow in areas that had high-profile bugs recently."
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
time: Remove all direct references to timekeeper
time: Clean up offs_real/wall_to_mono and offs_boot/total_sleep_time updates
time: Clean up stray newlines
time/jiffies: Rename ACTHZ to SHIFTED_HZ
time/jiffies: Allow CLOCK_TICK_RATE to be undefined
time: Fix casting issue in tk_set_xtime and tk_xtime_add
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions