tree a118eaef15d4ba22247f45ee01537ecc906cd161
parent 805a6af8dba5dfdd35ec35dc52ec0122400b2610
parent 7b7e5916aa2f46e57f8bd8cb89c34620ebfda5da
author James Morris <jmorris@namei.org> 1326071808 +1100
committer James Morris <jmorris@namei.org> 1326071808 +1100

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>