Tom Rini e20cc2ca15 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>		2013-08-18 14:14:34 -04:00
..
asm	Merge branch 'master' of git://88.191.163.10/u-boot-arm	2013-08-18 14:14:34 -04:00