Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <trini@konsulko.com>
Wed, 21 Jun 2017 12:00:04 +0000 (08:00 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 21 Jun 2017 12:00:04 +0000 (08:00 -0400)

Trivial merge