tag | 4d7fe73c6e9871111eb8c89dcc99093cfae17628 | |
---|---|---|
tagger | Simon Horman <horms@verge.net.au> | Tue Jul 02 13:24:52 2013 +0900 |
object | 38f4c6ae76d9c16f1295e0d7c995d7aac1defb47 |
Next branch of Renesas tree for Tue 2 Jul 2013
commit | 38f4c6ae76d9c16f1295e0d7c995d7aac1defb47 | [log] [tgz] |
---|---|---|
author | Simon Horman <horms+renesas@verge.net.au> | Tue Jul 02 12:33:31 2013 +0900 |
committer | Simon Horman <horms+renesas@verge.net.au> | Tue Jul 02 12:33:31 2013 +0900 |
tree | b0a4c31b384d8f72403057a162dbd85be8449116 | |
parent | 8163f68d18856b973c442ab8cb772049e9bb0698 [diff] | |
parent | 1a87b01d3b18709ae240ec90ae612354dd44d9a9 [diff] |
Merge branch 'heads/phy-rcar-usb' into next Conflicts: arch/arm/mach-shmobile/board-bockw.c arch/arm/mach-shmobile/board-marzen.c arch/arm/mach-shmobile/clock-r8a7778.c arch/arm/mach-shmobile/include/mach/r8a7778.h arch/arm/mach-shmobile/setup-r8a7778.c