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)
commit208937fdcfe780c91a94eb95a7082455f4aea8a4
treed5423e1bffdb0ba2fc424b30b965d75fea9ab39f
parent5fe37fcf0144407ec56c35aa25c8db4095494931
parent3e11e818bfd7bd4a8e1214970337bab73ffed32d
Merge branch 'x86-urgent-for-linus' of git://git./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