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

diff --cc configs/colibri_vf_defconfig
Simple merge

diff --cc drivers/usb/common/fsl-errata.c
Simple merge

diff --cc include/configs/colibri_imx7.h
Simple merge

diff --cc include/configs/dra7xx_evm.h
Simple merge