diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-06 22:56:02 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-06 22:56:02 +0100 |
| commit | 26cdd1f76a889a21faa851bcb260782db2c7f0a9 (patch) | |
| tree | 02dfc68b31e83b8390df0a0746138325f7788105 | |
| parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | hrtimer: Fix incorrect tai offset calculation for non high-res timer systems (diff) | |
| parent | Merge tag 'microcode_fix_for_3.19' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | linux-26cdd1f76a889a21faa851bcb260782db2c7f0a9.tar.xz linux-26cdd1f76a889a21faa851bcb260782db2c7f0a9.zip | |
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