diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-26 22:12:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-26 22:12:09 +0200 |
| commit | c1b669b72a05aeae0882742dd40f30d51732ed15 (patch) | |
| tree | 1d2cb03575597b24ce8955ec1b50a8922c356952 /arch | |
| parent | Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | x86, boot: Remove ancient, unconditionally #ifdef'd out dead code (diff) | |
| parent | x86, cpufeature: Add the RDSEED and ADX features (diff) | |
| download | linux-c1b669b72a05aeae0882742dd40f30d51732ed15.tar.xz 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