]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Feb 2014 22:15:46 +0000 (14:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Feb 2014 22:15:46 +0000 (14:15 -0800)
commitbd43242673147df608cc7be4f6a9b3dc0c4950b2
treed5423e1bffdb0ba2fc424b30b965d75fea9ab39f
parent3c966ce503d94d93f1e2bc66b29f85eac21e8e80
parentec1b185f5d264e3df1a3a2d20c21611f2a3df82a
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