tree f90a0e2266b73a2197a31d4b129a08f3f55e7b06
parent 4b2ce8f15f8fdcd8a73dd31664b252e2b4ed174a
parent da4aaa7d860c63a1bfd3c73cf8309afe2840c5b9
author Linus Torvalds <torvalds@linux-foundation.org> 1396372281 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1396372281 -0700

Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/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