From: Tom Rini Date: Sat, 1 Oct 2016 01:58:44 +0000 (-0400) Subject: Merge branch 'master' of git://git.denx.de/u-boot-usb X-Git-Tag: v2016.11-rc1~29 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fe4ba689a0cb2bb2ceafb88556a57bd80814b648;p=u-boot Merge branch 'master' of git://git.denx.de/u-boot-usb Signed-off-by: Tom Rini Conflicts: include/configs/dra7xx_evm.h --- fe4ba689a0cb2bb2ceafb88556a57bd80814b648