tree 9b9da4230d33c47298d4fa3e93a4a5f0cb047ee8
parent b4c6e2ea5e46b03c764a918f4999a77a3149979f
parent 94462ad3b14739d158a1ab87bb30008c1e5a6bc1
author Linus Torvalds <torvalds@linux-foundation.org> 1294340853 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294340853 -0800

Merge branch 'x86-security-for-linus' of git://git.kernel.org/pub/scm/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