git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cc9e4fe
43aa77f
d06830e
)
Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest
author
Paul Mundt
<lethal@linux-sh.org>
Tue, 10 Jan 2012 08:10:55 +0000
(17:10 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Tue, 10 Jan 2012 08:10:55 +0000
(17:10 +0900)
Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff