tree dc9b28fb3a1847fe7a560baa4e5c90dfadcca01f
parent 33d46f9765901a08d7759c031779073263e8b4e3
parent 2167ceabf34163727ca4e283c0f030e3960932e5
author Linus Torvalds <torvalds@linux-foundation.org> 1446608382 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1446608382 -0800

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

Pull x86 cpu changes from Ingo Molnar:
 "Two changes in this cycle: a Kconfig help text enhancement, and an AMD
  CLZERO instruction capability detection and enumeration"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu: Add CLZERO detection
  x86/Kconfig/cpus: Fix/complete CPU type help texts