James Morris 0e38c35815 Merge branch 'smack-for-4.3' of https://github.com/cschaufler/smack-next into next		2015-08-14 17:35:10 +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	switch keyctl_instantiate_key_common() to iov_iter	2015-04-11 22:27:12 -04:00
selinux	Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus2	2015-07-11 09:13:45 +10:00
smack	Smack - Fix build error with bringup unconfigured	2015-08-12 18:10:01 -07:00
tomoyo	LSM: Switch to lists of hooks	2015-05-12 15:00:41 +10:00
yama	Yama: remove needless CONFIG_SECURITY_YAMA_STACKED	2015-07-28 13:18:19 +10:00
commoncap.c	LSM: Switch to lists of hooks	2015-05-12 15:00:41 +10:00
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	Yama: remove needless CONFIG_SECURITY_YAMA_STACKED	2015-07-28 13:18:19 +10:00
lsm_audit.c	Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit	2015-06-27 13:53:16 -07:00
Makefile	LSM: Switch to lists of hooks	2015-05-12 15:00:41 +10:00
min_addr.c
security.c	Yama: remove needless CONFIG_SECURITY_YAMA_STACKED	2015-07-28 13:18:19 +10:00