| commit | 236573d2405d6b9fa5395d14731c2ec2f8cb8f4f | [log] [tgz] |
|---|---|---|
| author | Simon Horman <horms+renesas@verge.net.au> | Thu Dec 19 17:14:25 2013 +0900 |
| committer | Simon Horman <horms+renesas@verge.net.au> | Thu Dec 19 17:14:25 2013 +0900 |
| tree | ff261b48f83b55785d146a36d88fa2a51479e247 | |
| parent | 97aee1b8e444d0aa4904fb5d4850c9490e5b9935 [diff] | |
| parent | 374b105797c3d4f29c685f3be535c35f5689b30e [diff] |
Merge tag 'v3.13-rc3' into dt3-base Linux 3.13-rc3 Conflicts: drivers/pinctrl/sh-pfc/pfc-r8a7740.c drivers/pinctrl/sh-pfc/pfc-sh7372.c