| commit | ce3cf6ad8775f33c5a7dba36b7b01c1a18574d8c | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Fri Sep 30 21:58:44 2016 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Fri Sep 30 21:58:44 2016 -0400 |
| tree | 1012656ba1d3e9f8288d69de33c71417b2f22466 | |
| parent | 5467da27e0b06fd86b7783cd173a59641c1d24f6 [diff] | |
| parent | a1f422e61fd28478c9f1431dc7dcb77d932b1955 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-usb Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: include/configs/dra7xx_evm.h