diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 10:48:34 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 10:48:34 -0800 |
commit | 8ed5de58cf4c45ff0ca97cb0d48d76f0e42faec6 (patch) | |
tree | ede6bc489b4d0cae91d730393d6c0dc654528b46 /drivers | |
parent | 2dd550b90b03d5f236a18ae491bf6e70798469a8 (diff) | |
parent | 394c6753978a75cab7558a377f2551a3c1101027 (diff) | |
download | op-kernel-dev-8ed5de58cf4c45ff0ca97cb0d48d76f0e42faec6.zip op-kernel-dev-8ed5de58cf4c45ff0ca97cb0d48d76f0e42faec6.tar.gz |
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
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions