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:
  smack: fixes for unlabeled host support

...

This commit is contained in:

Linus Torvalds 2009-03-08 10:21:10 -07:00

parent 2a50b2560e 211a40c087

commit 153d8a122e

2 changed files with 57 additions and 50 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

43

security/smack/smack_lsm.c

View file

64

security/smack/smackfs.c

View file