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: more GFP_NOFS fixups to prevent selinux from re-entering the fs code

...

This commit is contained in:

Linus Torvalds 2008-04-07 19:15:35 -07:00

parent 4c3b01f711 869ab5147e

commit 7180c4c9e0

3 changed files with 13 additions and 9 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

7

security/selinux/hooks.c

View file

3

security/selinux/include/security.h

View file

12

security/selinux/ss/services.c

View file