| commit | 809609a5d8427b0025304dbb69a84a692d11c4f9 | [log] [tgz] |
|---|---|---|
| author | Simon Horman <horms+renesas@verge.net.au> | Tue Apr 02 11:08:34 2013 +0900 |
| committer | Simon Horman <horms+renesas@verge.net.au> | Tue Apr 02 11:08:34 2013 +0900 |
| tree | 95a544cda32d36e4a9ee1ce27c527406c54d91b4 | |
| parent | a4339a9cb46644e19278e4dd5d89b262a37cb0b0 [diff] | |
| parent | 8585deb18580d04209a2986430aa0959ef38fce2 [diff] |
Merge branch 'soc' into pinmux-base 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.