git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e76a013
ce3f7cb
)
Merge branch 'master' into sh/smp
author
Paul Mundt
<lethal@linux-sh.org>
Tue, 1 Sep 2009 04:54:14 +0000
(13:54 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Tue, 1 Sep 2009 04:54:14 +0000
(13:54 +0900)
Conflicts:
arch/sh/mm/cache-sh4.c
Trivial merge