| commit | c5e1fc6c489ef7b4f3eca14c9c951ba02ec5b077 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Wed Apr 20 09:31:58 2016 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Wed Apr 20 09:31:58 2016 -0400 |
| tree | 40a37edba62f5769156b543ea7a5e9c9377d5a15 | |
| parent | 7060ce18c5e029fe781b4ece6b2df6244088c3b8 [diff] | |
| parent | b706ffd8a7acede64ec04c12e5442bc31f80a717 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-usb Conflicts: configs/bcm28155_ap_defconfig configs/dra72_evm_defconfig configs/dra74_evm_defconfig configs/ma5d4evk_defconfig Signed-off-by: Tom Rini <trini@konsulko.com>