Merge branch 'stage-for-3.10' of git://git.gitorious.org/smack-next/kernel into ra-next

Browse source

...

This commit is contained in:

James Morris 2013-04-02 01:45:36 +11:00

parent d13274794a cdb56b6088

commit 9b0271d8ca

6 changed files with 187 additions and 89 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

11

Documentation/security/Smack.txt

View file

1

include/uapi/linux/magic.h

View file

5

security/smack/smack.h

View file

2

security/smack/smack_access.c

View file

4

security/smack/smack_lsm.c

View file

251

security/smack/smackfs.c

View file