From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 6 Feb 2008 18:48:34 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.25-rc1~516
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ed5de58cf4c45ff0ca97cb0d48d76f0e42faec6;p=linux-2.6

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux: Remove security_get_policycaps()
  security: allow Kconfig to set default mmap_min_addr protection
---

8ed5de58cf4c45ff0ca97cb0d48d76f0e42faec6