git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6ae6650
dec710b
3089f38
f4cff0d
)
Merge branches 'sh/intc-extension', 'sh/dmaengine', 'sh/serial-dma' and 'sh/clkfwk'
author
Paul Mundt
<lethal@linux-sh.org>
Tue, 30 Mar 2010 02:26:43 +0000
(11:26 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Tue, 30 Mar 2010 02:26:43 +0000
(11:26 +0900)
Conflicts:
arch/sh/kernel/cpu/clock.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff