]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
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)
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

1  2  3 
arch/x86/boot/header.S

Simple merge