diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 18:10:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 18:10:17 -0700 |
| commit | 5765040ebfc9a28d9dcfaaaaf3d25840d922de96 (patch) | |
| tree | 6fd0c9950beb3c9730ede405269c9a47bbcbf877 /net/mac80211/work.c | |
| parent | 08839ff8276bd1ba0ce8b2d595f9fe62a5b07210 (diff) | |
| parent | de5397ad5b9ad22e2401c4dacdf1bb3b19c05679 (diff) | |
Merge branch 'x86-smep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-smep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, cpu: Enable/disable Supervisor Mode Execution Protection
x86, cpu: Add SMEP CPU feature in CR4
x86, cpufeature: Add cpufeature flag for SMEP
Diffstat (limited to 'net/mac80211/work.c')
0 files changed, 0 insertions, 0 deletions