Next branch of Renesas tree for Thu 20 Jun 2013
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