git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f058925
72d3105
)
Merge branch 'master' into next
author
James Morris
<jmorris@namei.org>
Mon, 22 Sep 2008 00:41:56 +0000
(17:41 -0700)
committer
James Morris
<jmorris@namei.org>
Mon, 22 Sep 2008 00:41:56 +0000
(17:41 -0700)
Conflicts:
MAINTAINERS
Thanks for breaking my tree :-)
Signed-off-by: James Morris <jmorris@namei.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff