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

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  Revert "SELinux: allow fstype unknown to policy to use xattrs if present"

...

This commit is contained in:

Linus Torvalds 2008-07-15 08:16:48 -07:00

parent 97c7d1ea1f 089be43e40

commit 732b72069e

3 changed files with 14 additions and 37 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

22

security/selinux/hooks.c

View file

2

security/selinux/include/security.h

View file

27

security/selinux/ss/services.c

View file