Linus Torvalds e2f3b78557 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ... Pull SELinux regression fixes from James Morris. Andrew Morton has a box that hit that open perms problem. I also renamed the "epollwakeup" selinux name for the new capability to be "block_suspend", to match the rename done by commit d9914cf661 ("PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND"). * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: SELinux: do not check open perms if they are not known to policy SELinux: include definition of new capabilities		2012-07-18 13:42:44 -07:00
..
apparmor	split ->file_mmap() into ->mmap_addr()/->mmap_file()	2012-05-31 13:11:54 -04:00
integrity	ima: fix filename hint to reflect script interpreter name	2012-05-16 10:36:41 +10:00
keys	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-05-31 18:47:30 -07:00
selinux	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-07-18 13:42:44 -07:00
smack	split ->file_mmap() into ->mmap_addr()/->mmap_file()	2012-05-31 13:11:54 -04:00
tomoyo	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next	2012-05-22 11:21:06 +10:00
yama	Yama: replace capable() with ns_capable()	2012-05-15 10:27:57 +10:00
Kconfig	KEYS: Move the key config into security/keys/Kconfig	2012-05-11 10:56:56 +01:00
Makefile	…
capability.c	split ->file_mmap() into ->mmap_addr()/->mmap_file()	2012-05-31 13:11:54 -04:00
commoncap.c	split ->file_mmap() into ->mmap_addr()/->mmap_file()	2012-05-31 13:11:54 -04:00
device_cgroup.c	cgroup: convert all non-memcg controllers to the new cftype interface	2012-04-01 12:09:55 -07:00
inode.c	…
lsm_audit.c	LSM: BUILD_BUG_ON if the common_audit_data union ever grows	2012-04-09 12:23:03 -04:00
min_addr.c	…
security.c	security: Fix nommu build.	2012-07-03 21:41:03 +10:00