Merge git://git.denx.de/u-boot-tegra
authorTom Rini <trini@konsulko.com>
Fri, 11 May 2018 19:22:36 +0000 (15:22 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 11 May 2018 19:22:36 +0000 (15:22 -0400)

Trivial merge