Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Sat, 1 Oct 2016 01:58:44 +0000 (21:58 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 1 Oct 2016 01:58:44 +0000 (21:58 -0400)
commitfe4ba689a0cb2bb2ceafb88556a57bd80814b648
tree1012656ba1d3e9f8288d69de33c71417b2f22466
parentf413d1cae89143ad45b066b3d3bc602deafcb50a
parent4c043712e9910ef1d612aedbd8304a1f7348ef5f
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
configs/colibri_vf_defconfig
drivers/usb/common/fsl-errata.c
include/configs/colibri_imx7.h
include/configs/dra7xx_evm.h