git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b06ede8
cfefe99
)
Merge branch 'sh/dmaengine'
author
Paul Mundt
<lethal@linux-sh.org>
Mon, 8 Feb 2010 02:34:03 +0000
(11:34 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Mon, 8 Feb 2010 02:34:03 +0000
(11:34 +0900)
Conflicts:
arch/sh/drivers/dma/dma-sh.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff