tree 40a37edba62f5769156b543ea7a5e9c9377d5a15
parent ec3ab3f9b5c75b5a11f8f6f52951fa8dd45990be
parent e6c0bc0643e5a4387fecbcf83080d0b796eb067c
author Tom Rini <trini@konsulko.com> 1461159118 -0400
committer Tom Rini <trini@konsulko.com> 1461159118 -0400

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>