tag | e930a9298187838dd822a96df1b7a46353ced87c | |
---|---|---|
tagger | Simon Horman <horms@verge.net.au> | Wed Jun 19 22:01:08 2013 +0900 |
object | cec7d142e3aa81816fffd9a6a7a19436cc50dab6 |
Next branch of Renesas tree for Wed 19 Jun 2013
commit | cec7d142e3aa81816fffd9a6a7a19436cc50dab6 | [log] [tgz] |
---|---|---|
author | Simon Horman <horms+renesas@verge.net.au> | Wed Jun 19 21:43:26 2013 +0900 |
committer | Simon Horman <horms+renesas@verge.net.au> | Wed Jun 19 21:43:26 2013 +0900 |
tree | c3bc69a4d1784d2bbe5256cd9e2cf51df9e86feb | |
parent | 1a809a42e34a7f6f416de2e3fea85bd92104825e [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