tree b74ac36e0c766b5662bf78577ac0ae2e0274642b
parent 19d402c1e75077e2bcfe17f7fe5bcfc8deb74991
parent af0fa6f6b5851761e9fbf79eb14ba86e857b4e7b
author Linus Torvalds <torvalds@linux-foundation.org> 1407197565 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1407197565 -0700

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

Pull x86 cpufeature updates from Ingo Molnar:
 "The main changes in this cycle were:

   - Continued cleanups of CPU bugs mis-marked as 'missing features', by
     Borislav Petkov.

   - Detect the xsaves/xrstors feature and releated cleanup, by Fenghua
     Yu"

* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, cpu: Kill cpu_has_mp
  x86, amd: Cleanup init_amd
  x86/cpufeature: Add bug flags to /proc/cpuinfo
  x86, cpufeature: Convert more "features" to bugs
  x86/xsaves: Detect xsaves/xrstors feature
  x86/cpufeature.h: Reformat x86 feature macros