]> 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>
Tue, 18 Jun 2013 07:47:50 +0000 (16:47 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 18 Jun 2013 07:47:50 +0000 (16:47 +0900)
commit4e8ee671f3dc6d7fc4c6a2903a4920f61701d208
tree675f3ef92bc3fb1348d61afbc019781149f3e316
parentc8c53bcb63adfed61883b4cebafb32a6c8eb5fc2
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