git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2928238
722154e
)
Merge branch 'master' into next
author
James Morris
<jmorris@namei.org>
Thu, 6 May 2010 12:21:04 +0000
(22:21 +1000)
committer
James Morris
<jmorris@namei.org>
Thu, 6 May 2010 12:21:04 +0000
(22:21 +1000)
Conflicts:
security/keys/keyring.c
Resolved conflict with whitespace fix in find_keyring_by_name()
Signed-off-by: James Morris <jmorris@namei.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff