[pull request] x86-nx-emulation

[Kees Cook]

The following changes since commit 6b309e5592e1a214a6e6f5f1c8ddcf3c5055d424:

  i386: NX emulation (2010-07-14 00:50:02 -0700)

are available in the git repository at:
  git://kernel.ubuntu.com/kees/linux-2.6.git x86-nx-emulation

Kees Cook (2):
      nx-emu: drop exec-shield sysctl, merge with disable_nx
      nx-emu: standardize boottime message prefix

 arch/x86/kernel/cpu/common.c |    2 +-
 arch/x86/mm/setup_nx.c       |   15 ++++++++++-----
 fs/binfmt_elf.c              |    2 +-
 include/linux/sched.h        |    2 +-
 kernel/sysctl.c              |   21 ---------------------
 5 files changed, 13 insertions(+), 29 deletions(-)

-- 
Kees Cook
Ubuntu Security Team