| commit | a961ee1c95cb7309f619e9e68fe8c4fb73bedf6f | [log] [tgz] |
|---|---|---|
| author | Simon Horman <horms+renesas@verge.net.au> | Fri Jun 07 14:26:22 2013 +0900 |
| committer | Simon Horman <horms+renesas@verge.net.au> | Fri Jun 07 14:26:22 2013 +0900 |
| tree | 54f50bcbd0baa55be24ac7ffbf547b4b55d046a4 | |
| parent | 5fcf4a3c3a5bc08bf72a50ef1332501a3c1b96bb [diff] | |
| parent | 413bfd0e67894c930242482cd15ac09a800e2ab8 [diff] |
Merge branches 'pinmux' and 'soc' into boards-base Conflicts: arch/arm/mach-shmobile/Kconfig arch/arm/mach-shmobile/include/mach/r8a7778.h arch/arm/mach-shmobile/setup-r8a7778.c