]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Sep 2015 16:41:03 +0000 (09:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Sep 2015 16:41:03 +0000 (09:41 -0700)
commit6b2282aa372665c14ea1100b63ac0703051407e9
treecae241bd8e9653032ab33a9baf1401a3373ab307
parent0c0fee018d14b585461b146bdeda8bab9a61c211
parentb1c599b8ff80ea79b9f8277a3f9f36a7b0cfedce
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cpu updates from Ingo Molnar:
 "Two changes: a suspend/resume quirk and a new CPUID bit definition"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpufeature: Add feature bit for Intel's Silicon Debug CPUID bit
  x86/cpu: Restore MSR_IA32_ENERGY_PERF_BIAS after resume
arch/x86/include/asm/cpufeature.h
arch/x86/kernel/cpu/common.c