James Morris 5a2f3a02ae Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next ... Conflicts: fs/attr.c Resolve conflict manually. Signed-off-by: James Morris <jmorris@namei.org>		2011-08-09 10:31:03 +10:00
..
evm	evm: add evm_inode_setattr to prevent updating an invalid security.evm	2011-07-18 12:29:50 -04:00
ima	Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next	2011-08-09 10:31:03 +10:00
iint.c	evm: replace hmac_status with evm_status	2011-07-18 12:29:48 -04:00
integrity.h	evm: replace hmac_status with evm_status	2011-07-18 12:29:48 -04:00
Kconfig	evm: re-release	2011-07-18 12:29:40 -04:00
Makefile	evm: re-release	2011-07-18 12:29:40 -04:00