tag | 5eeac80ff56d974246c0094bb37bcbd9f35fe3b3 | |
---|---|---|
tagger | Simon Horman <horms@verge.net.au> | Thu Jun 13 15:12:41 2013 +0900 |
object | d700902b46448bcdc3483e381fa11b974e79171a |
Next branch of Renesas tree for Thu 13 Jun 2013
commit | d700902b46448bcdc3483e381fa11b974e79171a | [log] [tgz] |
---|---|---|
author | Simon Horman <horms+renesas@verge.net.au> | Thu Jun 13 14:51:35 2013 +0900 |
committer | Simon Horman <horms+renesas@verge.net.au> | Thu Jun 13 14:51:35 2013 +0900 |
tree | 7e1e6bd77fa7d69c1ad957c916e13a6a748c1588 | |
parent | da9ba91a80a176f7c0e88238e0a307c8a94a8e75 [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