Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Fri, 24 Aug 2018 20:11:01 +0000 (16:11 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 24 Aug 2018 20:11:01 +0000 (16:11 -0400)
1  2 
cmd/Kconfig
cmd/Makefile

diff --cc cmd/Kconfig
Simple merge
diff --cc cmd/Makefile
Simple merge