summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-09 00:51:21 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-09 00:51:21 +0200
commit81db4dbf592b486ac2bc7cabfb328ee2a6c4725d (patch)
treebb42fbbee400f55b13f49f30b392367798602652 /Documentation
parentMerge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux (diff)
parentMerge branch 'fortglx/3.10/time' of git://git.linaro.org/people/jstultz/linux... (diff)
downloadlinux-81db4dbf592b486ac2bc7cabfb328ee2a6c4725d.tar.xz
linux-81db4dbf592b486ac2bc7cabfb328ee2a6c4725d.zip
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner: - Trivial: unused variable removal - Posix-timers: Add the clock ID to the new proc interface to make it useful. The interface is new and should be functional when we reach the final 3.10 release. - Cure a false positive warning in the tick code introduced by the overhaul in 3.10 - Fix for a persistent clock detection regression introduced in this cycle * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: timekeeping: Correct run-time detection of persistent_clock. ntp: Remove unused variable flags in __hardpps posix-timers: Show clock ID in proc file tick: Cure broadcast false positive pending bit warning
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions