| commit | 68e005c82592ebe3a1ef12b0cb4264d3fbf928e0 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Sun Aug 18 14:14:34 2013 -0400 |
| committer | Tom Rini <trini@ti.com> | Sun Aug 18 14:14:34 2013 -0400 |
| tree | f85a22536682ef54e77b1ba95cf0b71d00644632 | |
| parent | e977043df183e9a3a56474cc9a97a918f9a29907 [diff] | |
| parent | a3157ef1cd304197f9d07a92926a3bbed4e8681c [diff] |
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>