Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Aug 2009 20:38:58 +0000 (13:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Aug 2009 20:38:58 +0000 (13:38 -0700)
commit52dec22e739eec8f3a0154f768a599f5489048bd
treeea45071114d7f5b5b84d9615f1e8a16afc6438e4
parent08e53fcb0db34baca3db84a457b6d67faabee4c6
parent1d9959734a1949ea4f2427bd2d8b21ede6b2441c
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  security: define round_hint_to_min in !CONFIG_SECURITY
  Security/SELinux: seperate lsm specific mmap_min_addr
  SELinux: call cap_file_mmap in selinux_file_mmap
  Capabilities: move cap_file_mmap to commoncap.c