Paul Moore 98f700f317 Merge git://git.infradead.org/users/eparis/selinux ... Conflicts: security/selinux/hooks.c Pull Eric's existing SELinux tree as there are a number of patches in there that are not yet upstream. There was some minor fixup needed to resolve a conflict in security/selinux/hooks.c:selinux_set_mnt_opts() between the labeled NFS patches and Eric's security_fs_use() simplification patch.		2013-09-18 13:52:20 -04:00
..
apparmor	apparmor: no need to delay vfree()	2013-05-12 21:31:02 +10:00
integrity	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2013-07-03 14:04:58 -07:00
keys	aio: don't include aio.h in sched.h	2013-05-07 20:16:25 -07:00
selinux	Merge git://git.infradead.org/users/eparis/selinux	2013-09-18 13:52:20 -04:00
smack	Smack: IPv6 casting error fix for 3.11	2013-08-06 20:53:54 +10:00
tomoyo	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
yama	yama: Better permission check for ptraceme	2013-03-26 13:17:58 -07:00
capability.c	Merge git://git.infradead.org/users/eparis/selinux	2013-09-18 13:52:20 -04:00
commoncap.c	kill f_vfsmnt	2013-02-26 02:46:10 -05:00
device_cgroup.c	device_cgroup: simplify cgroup tree walk in propagate_exception()	2013-05-24 10:55:38 +09:00
inode.c	securityfs: fix object creation races	2012-01-10 10:20:35 -05:00
Kconfig	KEYS: Move the key config into security/keys/Kconfig	2012-05-11 10:56:56 +01:00
lsm_audit.c	LSM: BUILD_BUG_ON if the common_audit_data union ever grows	2012-04-09 12:23:03 -04:00
Makefile	security: Yama LSM	2012-02-10 09:18:52 +11:00
min_addr.c
security.c	Merge git://git.infradead.org/users/eparis/selinux	2013-09-18 13:52:20 -04:00