Pull request for hardy (/dev/mem protections)

[Kees Cook]

The following changes since commit 3a870d0db6091ec4a9be50f0c6e2fe306b71a101:
  Tim Gardner (1):
        Merge branch 'master' of zinc.canonical.com:/srv/kernel.ubuntu.com/git/ubuntu/ubuntu-hardy

are available in the git repository at:

  git://kernel.ubuntu.com/kees/ubuntu-hardy-kees.git master

Kees Cook (1):
      UBUNTU: SAUCE: x86: introduce /dev/mem restrictions with a config option

 arch/x86/Kconfig.debug    |   12 ++++++++
 arch/x86/mm/init_32.c     |   42 +++++++++++++++++++++++-----
 arch/x86/mm/init_64.c     |   66 +++++++++++++++++++++++++++++++++++++++++++++
 drivers/char/mem.c        |   28 +++++++++++++++++++
 include/asm-x86/e820.h    |    3 ++
 include/asm-x86/page_32.h |    1 +
 include/asm-x86/page_64.h |    3 ++
 7 files changed, 147 insertions(+), 8 deletions(-)

-- 
Kees Cook
Ubuntu Security Team