| commit | 8ed5de58cf4c45ff0ca97cb0d48d76f0e42faec6 | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Wed, 6 Feb 2008 18:48:34 +0000 (6 10:48 -0800) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Wed, 6 Feb 2008 18:48:34 +0000 (6 10:48 -0800) | ||
| tree | ede6bc489b4d0cae91d730393d6c0dc654528b46 | treesnapshot (tar.gz zip) |
| parent | 2dd550b90b03d5f236a18ae491bf6e70798469a8 | commitdiff |
| parent | 394c6753978a75cab7558a377f2551a3c1101027 | commitdiff |
Merge branch 'for-linus' of git://git./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
* '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