git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a4339a9
8585deb
)
Merge branch 'soc' into pinmux-base
author
Simon Horman
<horms+renesas@verge.net.au>
Tue, 2 Apr 2013 02:08:34 +0000
(11:08 +0900)
committer
Simon Horman
<horms+renesas@verge.net.au>
Tue, 2 Apr 2013 02:08:34 +0000
(11:08 +0900)
Conflicts:
drivers/pinctrl/sh-pfc/pfc-r8a7740.c
This merge is to provide r8a73a4 SoC files, which are added in the
soc branch and depended on by r8a73a4 pfc-changes which are to
be added to the pinmux branch.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff