From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Jul 2016 02:41:35 +0000 (-0700)
Subject: Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: Ubuntu-4.10.0-19.21~2971
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5f22004ba9b4cf740773777ea7b74586743f6051;p=mirror_ubuntu-artful-kernel.git

Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 timer updates from Ingo Molnar:
 "The main change in this tree is the reworking, fixing and extension of
  the TSC frequency enumeration code (by Len Brown)"

* 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/tsc: Remove the unused check_tsc_disabled()
  x86/tsc: Enumerate BXT tsc_khz via CPUID
  x86/tsc: Enumerate SKL cpu_khz and tsc_khz via CPUID
  x86/tsc_msr: Remove irqoff around MSR-based TSC enumeration
  x86/tsc_msr: Add Airmont reference clock values
  x86/tsc_msr: Correct Silvermont reference clock values
  x86/tsc_msr: Update comments, expand definitions
  x86/tsc_msr: Remove debugging messages
  x86/tsc_msr: Identify Intel-specific code
  Revert "x86/tsc: Add missing Cherrytrail frequency to the table"
---

5f22004ba9b4cf740773777ea7b74586743f6051