Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Mon, 9 Jan 2012 01:16:48 +0000 (12:16 +1100)
committerJames Morris <jmorris@namei.org>
Mon, 9 Jan 2012 01:16:48 +0000 (12:16 +1100)
commit8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8
treea118eaef15d4ba22247f45ee01537ecc906cd161
parent805a6af8dba5dfdd35ec35dc52ec0122400b2610
parent7b7e5916aa2f46e57f8bd8cb89c34620ebfda5da
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>
include/linux/security.h
security/integrity/evm/evm_crypto.c