diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-07 10:37:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-07 10:37:48 -0700 |
| commit | ebc54f278f496798a3ea1df9ae29c1055e9de95e (patch) | |
| tree | bdcd1fa48c0e318a203ca1c4c048e1855cc81ec7 /include/media/i2c-addr.h | |
| parent | 2b12164b55e76e421c069de2cdf6b04c077983f1 (diff) | |
| parent | 9bf2419fa7bffa16ce58a4d5c20399eff8c970c9 (diff) | |
| download | linux-ebc54f278f496798a3ea1df9ae29c1055e9de95e.tar.bz2 | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"Three fixlets from the timer departement:
- Update the timekeeper before updating vsyscall and pvclock. This
fixes the kvm-clock regression reported by Chris and Paolo.
- Use the proper irq work interface from NMI. This fixes the
regression reported by Catalin and Dave.
- Clarify the compat_nanosleep error handling mechanism to avoid
future confusion"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timekeeping: Update timekeeper before updating vsyscall and pvclock
compat: nanosleep: Clarify error handling
nohz: Restore NMI safe local irq work for local nohz kick
Diffstat (limited to 'include/media/i2c-addr.h')
0 files changed, 0 insertions, 0 deletions