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 /include | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | SELinux: Remove security_get_policycaps() (diff) | |
| download | linux-8ed5de58cf4c45ff0ca97cb0d48d76f0e42faec6.tar.gz linux-8ed5de58cf4c45ff0ca97cb0d48d76f0e42faec6.zip | |
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 'include')
0 files changed, 0 insertions, 0 deletions