Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel into next

Browse source

...

This commit is contained in:

James Morris 2015-01-22 13:22:23 +11:00

parent 743410a03b 6d1cff2a88

commit 9d5a5f65fc

5 changed files with 267 additions and 52 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

12

security/smack/Kconfig

View file

1

security/smack/Makefile

View file

11

security/smack/smack.h

View file

199

security/smack/smack_lsm.c

View file

96

security/smack/smack_netfilter.c

View file