Merge branch 'x86-smep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2011 01:10:17 +0000 (18:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2011 01:10:17 +0000 (18:10 -0700)
commit5765040ebfc9a28d9dcfaaaaf3d25840d922de96
tree6fd0c9950beb3c9730ede405269c9a47bbcbf877
parent08839ff8276bd1ba0ce8b2d595f9fe62a5b07210
parentde5397ad5b9ad22e2401c4dacdf1bb3b19c05679
Merge branch 'x86-smep-for-linus' of git://git./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
Documentation/kernel-parameters.txt
arch/x86/include/asm/cpufeature.h