James Morris 8fcc995495 Merge branch 'next' into for-linus ... Conflicts: security/integrity/evm/evm_crypto.c Resolved upstream fix vs. next conflict manually. Signed-off-by: James Morris <jmorris@namei.org>		2012-01-09 12:16:48 +11:00
..
evm	Merge branch 'next' into for-linus	2012-01-09 12:16:48 +11:00
ima	ima: fix invalid memory reference	2011-12-19 22:07:54 -05:00
digsig.c	integrity: digital signature verification using multiple keyrings	2011-11-09 16:51:09 +02:00
iint.c	evm: clean verification status	2011-09-14 15:24:52 -04:00
integrity.h	integrity: digital signature verification using multiple keyrings	2011-11-09 16:51:09 +02:00
Kconfig	digsig: build dependency fix	2011-11-22 10:02:32 +11:00
Makefile	integrity: digital signature verification using multiple keyrings	2011-11-09 16:51:09 +02:00