| commit | eb6b50f631628f48b7e72432ae878e6ff0e306c3 | [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 | ec3ab3f9b5c75b5a11f8f6f52951fa8dd45990be [diff] | |
| parent | e6c0bc0643e5a4387fecbcf83080d0b796eb067c [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>