git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f32154c
96987d9
)
Merge branch 'sh/sdhi-mfd'
author
Paul Mundt
<lethal@linux-sh.org>
Mon, 26 Oct 2009 01:47:44 +0000
(10:47 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Mon, 26 Oct 2009 01:47:44 +0000
(10:47 +0900)
Conflicts:
arch/sh/boards/mach-ecovec24/setup.c
arch/sh/boards/mach-kfr2r09/setup.c
Trivial merge