Dmitry Kasatkin d26e193622 ima: fix bug in argument order ... mask argument goes first, then func, like ima_must_measure and ima_get_action. ima_inode_post_setattr() assumes that. Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Signed-off-by: James Morris <james.l.morris@oracle.com>		2012-10-05 22:32:16 +10:00
..
apparmor	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2012-10-02 11:11:09 -07:00
integrity	ima: fix bug in argument order	2012-10-05 22:32:16 +10:00
keys	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-10-02 21:38:48 -07:00
selinux	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-10-02 20:25:04 -07:00
smack	Smack: setprocattr memory leak fix	2012-09-18 09:51:06 -07:00
tomoyo	userns: Teach security_path_chown to take kuids and kgids	2012-09-21 03:13:25 -07:00
yama	Linux 3.6-rc7	2012-09-28 13:37:32 +10:00
capability.c	userns: Teach security_path_chown to take kuids and kgids	2012-09-21 03:13:25 -07:00
commoncap.c	split ->file_mmap() into ->mmap_addr()/->mmap_file()	2012-05-31 13:11:54 -04:00
device_cgroup.c	cgroup: mark subsystems with broken hierarchy support and whine if cgroups are nested for them	2012-09-14 12:01:16 -07:00
inode.c
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
min_addr.c
security.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-10-02 21:38:48 -07:00