James Morris 3dbbbe0eb6 Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus2

2015-07-11 09:13:45 +10:00

..

apparmor

Minor merge needed, due to function move.

2015-07-01 10:49:25 -07:00

integrity

Minor merge needed, due to function move.

2015-07-01 10:49:25 -07:00

keys

…

selinux

Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus2

2015-07-11 09:13:45 +10:00

smack

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2015-07-03 15:20:57 -07:00

tomoyo

…

yama

…

commoncap.c

…

device_cgroup.c

…

inode.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-07-04 19:36:06 -07:00

Kconfig

…

lsm_audit.c

Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

2015-06-27 13:53:16 -07:00

Makefile

…

min_addr.c

…

security.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2015-06-27 13:26:03 -07:00