Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <trini@konsulko.com>
Fri, 6 Jul 2018 21:12:06 +0000 (17:12 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 6 Jul 2018 21:12:06 +0000 (17:12 -0400)

Trivial merge