diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-20 14:15:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-20 14:15:13 -0400 |
| commit | 4db88eb4c300333ed37585f75ab9a664ec537d68 (patch) | |
| tree | 08b65728c54965970d711131dd83077ebb97b407 /init | |
| parent | 53d5defcfa8c9603554a3174cbe206fb69f6e8ef (diff) | |
| parent | f5d00c1f9adb350c24c5301600f7bf2da99b66de (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:
- Fix inconstinant clock usage in virtual time accounting
- Fix a build error in KVM caused by the NOHZ work
- Remove a pointless timekeeping duty assignment which breaks NOHZ
- Use a proper notifier return value to avoid random behaviour
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tick: Remove useless timekeeping duty attribution to broadcast source
nohz: Fix notifier return val that enforce timekeeping
kvm: Move guest entry/exit APIs to context_tracking
vtime: Use consistent clocks among nohz accounting
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions