git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5fcf4a3
413bfd0
)
Merge branches 'pinmux' and 'soc' into boards-base
author
Simon Horman
<horms+renesas@verge.net.au>
Fri, 7 Jun 2013 05:26:22 +0000
(14:26 +0900)
committer
Simon Horman
<horms+renesas@verge.net.au>
Fri, 7 Jun 2013 05:26:22 +0000
(14:26 +0900)
Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/include/mach/r8a7778.h
arch/arm/mach-shmobile/setup-r8a7778.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff