| commit | c0003f25b7a1a532de35e38fc3acbd36c8991379 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Thu Dec 11 18:40:49 2014 -0500 |
| committer | Tom Rini <trini@ti.com> | Thu Dec 11 18:40:49 2014 -0500 |
| tree | e50527455a67f1fc9f793f42d9672b237ac806f7 | |
| parent | f196fff46a8549589a0e909d814ab5a36478898b [diff] | |
| parent | d1af69c6e3c624b1cbc6768b415034ae4472e8d1 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-usb Conflicts: board/freescale/mx6sxsabresd/mx6sxsabresd.c Signed-off-by: Tom Rini <trini@ti.com>