From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Jan 2011 19:07:33 +0000 (-0800)
Subject: Merge branch 'x86-security-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.38-rc1~481
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f00b901d4233a78e6ca4d44c8c6fc5d38a3ee9e;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'x86-security-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-security-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  module: Move RO/NX module protection to after ftrace module update
  x86: Resume trampoline must be executable
  x86: Add RO/NX protection for loadable kernel modules
  x86: Add NX protection for kernel data
  x86: Fix improper large page preservation
---

4f00b901d4233a78e6ca4d44c8c6fc5d38a3ee9e