summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot/header.S
diff options
context:
space:
mode:
authorLinus Torvalds2012-07-26 22:12:09 +0200
committerLinus Torvalds2012-07-26 22:12:09 +0200
commitc1b669b72a05aeae0882742dd40f30d51732ed15 (patch)
tree1d2cb03575597b24ce8955ec1b50a8922c356952 /arch/x86/boot/header.S
parentMerge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentx86, boot: Remove ancient, unconditionally #ifdef'd out dead code (diff)
parentx86, cpufeature: Add the RDSEED and ADX features (diff)
downloadkernel-qcow2-linux-c1b669b72a05aeae0882742dd40f30d51732ed15.tar.gz
kernel-qcow2-linux-c1b669b72a05aeae0882742dd40f30d51732ed15.tar.xz
kernel-qcow2-linux-c1b669b72a05aeae0882742dd40f30d51732ed15.zip
Merge branches 'x86-cleanups-for-linus' and 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/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