]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1cb2d3413089e175f26ec5e2537f55deb8f49700
treea118eaef15d4ba22247f45ee01537ecc906cd161
parentbf17f95934ad16844ebaeb69e55157d08f1294b9
parentbc994d46e56704200cc0b0b3eb8356615a6c68f7
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