diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-06 13:56:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-06 13:56:02 -0800 |
| commit | 26cdd1f76a889a21faa851bcb260782db2c7f0a9 (patch) | |
| tree | 02dfc68b31e83b8390df0a0746138325f7788105 /fs/btrfs | |
| parent | 396e9099ea5b4bc442995c807a779025d06663e8 (diff) | |
| parent | 2d926c15d629a13914ce3e5f26354f6a0ac99e70 (diff) | |
| parent | 6d84d1d13081dca4b6bd532fb8b95a7ed5a816dd (diff) | |
Merge branches 'timers-urgent-for-linus' and 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer and x86 fix from Ingo Molnar:
"A CLOCK_TAI early expiry fix and an x86 microcode driver oops fix"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
hrtimer: Fix incorrect tai offset calculation for non high-res timer systems
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, microcode: Return error from driver init code when loader is disabled