James Morris d4a82a4a03 Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next ... Conflicts: security/selinux/hooks.c Resolved using request struct. Signed-off-by: James Morris <james.l.morris@oracle.com>		2014-01-07 01:45:59 +11:00
..
apparmor	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2013-11-21 19:46:00 -08:00
integrity	Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM	2014-01-06 22:23:01 +11:00
keys	security: shmem: implement kernel private shmem inodes	2013-12-02 11:24:19 +00:00
selinux	Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next	2014-01-07 01:45:59 +11:00
smack	Smack: File receive audit correction	2013-12-31 13:35:27 -08: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	Linux 3.12	2013-11-26 17:32:55 -05:00
commoncap.c	capabilities: allow nice if we are privileged	2013-08-30 23:44:09 -07:00
device_cgroup.c	device_cgroup: remove can_attach	2013-10-24 06:56:56 -04: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	Merge git://git.infradead.org/users/eparis/audit	2013-11-21 19:18:14 -08:00
Makefile	security: remove erroneous comment about capabilities.o link ordering	2013-09-24 11:26:28 +10:00
min_addr.c	mmap_min_addr check CAP_SYS_RAWIO only for write	2010-04-23 08:56:31 +10:00
security.c	Linux 3.12	2013-11-26 17:32:55 -05:00