From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Sep 2015 16:41:03 +0000 (-0700)
Subject: Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~1192
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6b2282aa372665c14ea1100b63ac0703051407e9;p=firefly-linux-kernel-4.4.55.git

Merge branch 'x86-cpu-for-linus' of git://git./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
---

6b2282aa372665c14ea1100b63ac0703051407e9