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	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	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	LSM: Switch to lists of hooks	2015-05-12 15:00:41 +10:00
yama	LSM: Switch to lists of hooks	2015-05-12 15:00:41 +10:00
commoncap.c	LSM: Switch to lists of hooks	2015-05-12 15:00:41 +10:00
device_cgroup.c	cgroup: rename cgroup_subsys->base_cftypes to ->legacy_cftypes	2014-07-15 11:05:09 -04:00
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	kernel: conditionally support non-root users, groups and capabilities	2015-04-15 16:35:22 -07: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	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2015-06-27 13:26:03 -07:00