diff options
| author | Linus Torvalds | 2014-02-23 23:15:46 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-02-23 23:15:46 +0100 |
| commit | 208937fdcfe780c91a94eb95a7082455f4aea8a4 (patch) | |
| tree | d5423e1bffdb0ba2fc424b30b965d75fea9ab39f /drivers/acpi/ec.c | |
| parent | Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | x86: tsc: Add missing Baytrail frequency to the table (diff) | |
| download | kernel-qcow2-linux-208937fdcfe780c91a94eb95a7082455f4aea8a4.tar.gz kernel-qcow2-linux-208937fdcfe780c91a94eb95a7082455f4aea8a4.tar.xz kernel-qcow2-linux-208937fdcfe780c91a94eb95a7082455f4aea8a4.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
- a bugfix which prevents a divide by 0 panic when the newly introduced
try_msr_calibrate_tsc() fails
- enablement of the Baytrail platform to utilize the newfangled msr
based calibration
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: tsc: Add missing Baytrail frequency to the table
x86, tsc: Fallback to normal calibration if fast MSR calibration fails
Diffstat (limited to 'drivers/acpi/ec.c')
0 files changed, 0 insertions, 0 deletions