git.dujemihanovic.xyz Git - u-boot.git/commit

]> git.dujemihanovic.xyz Git - u-boot.git/commit

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

My U-Boot fork

configs/colibri_vf_defconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/common/fsl-errata.c	diff1 \|	diff2 \|	blob \| history
include/configs/colibri_imx7.h	diff1 \|	diff2 \|	blob \| history
include/configs/dra7xx_evm.h	diff1 \|	diff2 \|	blob \| history