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

6.1 KiB

Raw Blame History

View Raw