diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 03:10:17 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 03:10:17 +0200 |
commit | 5765040ebfc9a28d9dcfaaaaf3d25840d922de96 (patch) | |
tree | 6fd0c9950beb3c9730ede405269c9a47bbcbf877 /net/sctp/probe.c | |
parent | Merge branches 'x86-reboot-for-linus' and 'x86-setup-for-linus' of git://git.... (diff) | |
parent | x86, cpu: Enable/disable Supervisor Mode Execution Protection (diff) | |
download | linux-5765040ebfc9a28d9dcfaaaaf3d25840d922de96.tar.xz linux-5765040ebfc9a28d9dcfaaaaf3d25840d922de96.zip |
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/sctp/probe.c')
0 files changed, 0 insertions, 0 deletions