summaryrefslogtreecommitdiff
path: root/fs/hpfs/file.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-08 15:51:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-08 15:51:21 -0700
commit81db4dbf592b486ac2bc7cabfb328ee2a6c4725d (patch)
treebb42fbbee400f55b13f49f30b392367798602652 /fs/hpfs/file.c
parentc3e58a7945c8f1e4ec09ef93832a3839c5a70be2 (diff)
parent67dd331c5d811b2e50c935a24c82f31b61c6dcd3 (diff)
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 'fs/hpfs/file.c')
0 files changed, 0 insertions, 0 deletions