Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into next

Browse source

...

This commit is contained in:

James Morris 2015-12-26 16:07:31 +11:00

parent 3cb92fe481 76319946f3

commit 37babe4ec6

15 changed files with 302 additions and 88 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

8

include/linux/audit.h

View file

10

include/linux/lsm_hooks.h

View file

13

include/linux/security.h

View file