git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
97aee1b
374b105
)
Merge tag 'v3.13-rc3' into dt3-base
author
Simon Horman
<horms+renesas@verge.net.au>
Thu, 19 Dec 2013 08:14:25 +0000
(17:14 +0900)
committer
Simon Horman
<horms+renesas@verge.net.au>
Thu, 19 Dec 2013 08:14:25 +0000
(17:14 +0900)
Linux 3.13-rc3
Conflicts:
drivers/pinctrl/sh-pfc/pfc-r8a7740.c
drivers/pinctrl/sh-pfc/pfc-sh7372.c
Trivial merge