From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 17 Aug 2009 20:38:58 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.31-rc7~32
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=52dec22e739eec8f3a0154f768a599f5489048bd;p=~emulex%2Finfiniband.git

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

52dec22e739eec8f3a0154f768a599f5489048bd