From: Linus Torvalds Date: Fri, 20 May 2011 01:10:17 +0000 (-0700) Subject: Merge branch 'x86-smep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v3.0-rc1~393 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=5765040ebfc9a28d9dcfaaaaf3d25840d922de96 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 --- 5765040ebfc9a28d9dcfaaaaf3d25840d922de96