From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Apr 2014 17:11:21 +0000 (-0700)
Subject: Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: MMI-PSA29.97-13-9~12518
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b9b16a792241e304834f43e2a5f02e6e43576f09;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'x86-cpufeature-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 cpufeature update from Ingo Molnar:
 "Two refinements to clflushopt support"

* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, cpufeature: If we disable CLFLUSH, we should disable CLFLUSHOPT
  x86, cpufeature: Rename X86_FEATURE_CLFLSH to X86_FEATURE_CLFLUSH
---

b9b16a792241e304834f43e2a5f02e6e43576f09