]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'heads/phy-rcar-usb' into next
authorSimon Horman <horms+renesas@verge.net.au>
Thu, 27 Jun 2013 08:25:17 +0000 (17:25 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Thu, 27 Jun 2013 08:25:17 +0000 (17:25 +0900)
commit58967ce0a838095d0f26eef785b68503918576db
treeff9d6b2369c7b2890783ebcb78dc8e72e85cf5b2
parent77f95d1268b6a051fe97289447aa48f964a300dc
parent1a87b01d3b18709ae240ec90ae612354dd44d9a9
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
arch/arm/mach-shmobile/Kconfig
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
arch/arm/mach-shmobile/setup-r8a7779.c