| commit | 8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8 | [log] [tgz] |
|---|---|---|
| author | James Morris <jmorris@namei.org> | Mon Jan 09 12:16:48 2012 +1100 |
| committer | James Morris <jmorris@namei.org> | Mon Jan 09 12:16:48 2012 +1100 |
| tree | a118eaef15d4ba22247f45ee01537ecc906cd161 | |
| parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 [diff] | |
| parent | 7b7e5916aa2f46e57f8bd8cb89c34620ebfda5da [diff] |
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>