git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
35f6cd4
83515bc
)
Merge branch 'sh/stable-updates'
author
Paul Mundt
<lethal@linux-sh.org>
Mon, 26 Apr 2010 07:08:27 +0000
(16:08 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Mon, 26 Apr 2010 07:08:27 +0000
(16:08 +0900)
Conflicts:
arch/sh/kernel/dwarf.c
drivers/dma/shdma.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff