tree f85a22536682ef54e77b1ba95cf0b71d00644632
parent f21876174364391757e743cb8673d3fc5fce7ac7
parent 9ed887caecb9ecb0c68773a1870d143b9f28d3da
author Tom Rini <trini@ti.com> 1376849674 -0400
committer Tom Rini <trini@ti.com> 1376849674 -0400

Merge branch 'master' of git://88.191.163.10/u-boot-arm

Fixup an easy conflict over adding the clk_get prototype and USB_OTG
defines for am33xx having moved.

Conflicts:
	arch/arm/include/asm/arch-am33xx/hardware.h

Signed-off-by: Tom Rini <trini@ti.com>