git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
805a6af
7b7e591
)
Merge branch 'next' into for-linus
author
James Morris
<jmorris@namei.org>
Mon, 9 Jan 2012 01:16:48 +0000
(12:16 +1100)
committer
James Morris
<jmorris@namei.org>
Mon, 9 Jan 2012 01:16:48 +0000
(12:16 +1100)
Conflicts:
security/integrity/evm/evm_crypto.c
Resolved upstream fix vs. next conflict manually.
Signed-off-by: James Morris <jmorris@namei.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff