Forked from
Reform / reform-boundary-uboot
30793 commits behind the upstream repository.
Tom Rini
authored
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>