Merge branches 'x86-cleanups-for-linus' and 'x86-cpufeature-for-linus' of git://git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Jul 2012 20:12:09 +0000 (13:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Jul 2012 20:12:09 +0000 (13:12 -0700)
commitc1b669b72a05aeae0882742dd40f30d51732ed15
tree1d2cb03575597b24ce8955ec1b50a8922c356952
parent3d72b105b09e69fbe76135fcee3e1710684b2d4a
parente5a7286b5f1b0b5beb97275f2152bf10c4aa4204
parent30d5c4546a7dae29a1aa76abdb69a78bb00136be
Merge branches 'x86-cleanups-for-linus' and 'x86-cpufeature-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 cleanup and cpufeature from Ingo Molnar:
 "Just a single cleanup and and a commit that adds new CPU feature
  names"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, boot: Remove ancient, unconditionally #ifdef'd out dead code

* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, cpufeature: Add the RDSEED and ADX features
arch/x86/boot/header.S