Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2008-02-06 10:48:34 -08:00

parent 2dd550b90b 394c675397

commit 8ed5de58cf

4 changed files with 21 additions and 35 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

18

security/Kconfig

View file

4

security/security.c

View file

1

security/selinux/include/security.h

View file

33

security/selinux/ss/services.c

View file