git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
63862f1
687c27b
)
Merge branch 'heads/soc2' into boards2-base
author
Simon Horman
<horms+renesas@verge.net.au>
Tue, 8 Oct 2013 01:01:47 +0000
(10:01 +0900)
committer
Simon Horman
<horms+renesas@verge.net.au>
Tue, 8 Oct 2013 01:01:47 +0000
(10:01 +0900)
Conflicts:
arch/arm/mach-shmobile/board-lager.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff