Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Wed, 20 Apr 2016 13:31:58 +0000 (09:31 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 20 Apr 2016 13:31:58 +0000 (09:31 -0400)
commiteb6b50f631628f48b7e72432ae878e6ff0e306c3
tree40a37edba62f5769156b543ea7a5e9c9377d5a15
parentec3ab3f9b5c75b5a11f8f6f52951fa8dd45990be
parente6c0bc0643e5a4387fecbcf83080d0b796eb067c
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>
configs/bcm28155_ap_defconfig
configs/dra72_evm_defconfig
configs/dra74_evm_defconfig
configs/ma5d4evk_defconfig
include/configs/bcm28155_ap.h
include/configs/colibri_vf.h
include/configs/ma5d4evk.h
include/configs/siemens-am33x-common.h
include/configs/smartweb.h