| commit | fc9b0b80435cda721fbdbe507c9e4f388b0ea62b | [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 | 2c49323d5de38e119f102fa3f5fb291c4bc4e8a0 [diff] | |
| parent | 0c6de8853b2571251fdefe34598e0c344fe1372b [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>