diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-17 13:38:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-17 13:38:58 -0700 |
| commit | 52dec22e739eec8f3a0154f768a599f5489048bd (patch) | |
| tree | ea45071114d7f5b5b84d9615f1e8a16afc6438e4 /fs | |
| parent | 08e53fcb0db34baca3db84a457b6d67faabee4c6 (diff) | |
| parent | 1d9959734a1949ea4f2427bd2d8b21ede6b2441c (diff) | |
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions