git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
98724b7
8b3e32c
)
Merge branch 'dt2' into cleanup3-base
author
Simon Horman
<horms+renesas@verge.net.au>
Tue, 6 Aug 2013 09:06:53 +0000
(18:06 +0900)
committer
Simon Horman
<horms+renesas@verge.net.au>
Tue, 6 Aug 2013 09:06:53 +0000
(18:06 +0900)
Conflicts:
arch/arm/mach-shmobile/Makefile.boot
Trivial merge