git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b2212ea
41797f7
)
Merge branch 'sh/rsk-updates' into sh-latest
author
Paul Mundt
<lethal@linux-sh.org>
Thu, 10 May 2012 02:51:07 +0000
(11:51 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Thu, 10 May 2012 02:51:07 +0000
(11:51 +0900)
Conflicts:
arch/sh/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge