diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 02:19:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 02:19:47 +0200 |
| commit | 708d0b41a26907ac83cde41dd5a75b5a2f8f1218 (patch) | |
| tree | 81fec9b45c052e98b563a93d5b6548e9e7630e34 /net/can | |
| parent | f1d0d14120a8a6224a8aead925cf4310f48947d5 (diff) | |
| parent | 9298b815efe500b272e4084ed05eeae7a92b5340 (diff) | |
| download | linux-708d0b41a26907ac83cde41dd5a75b5a2f8f1218.tar.bz2 | |
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:
"This tree includes the following changes:
- Introduce DISABLED_MASK to list disabled CPU features, to simplify
CPU feature handling and avoid excessive #ifdefs
- Remove the lightly used cpu_has_pae() primitive"
* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Add more disabled features
x86: Introduce disabled-features
x86: Axe the lightly-used cpu_has_pae
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions