Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <trini@konsulko.com>
Wed, 6 Jul 2016 19:55:36 +0000 (15:55 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 6 Jul 2016 19:55:36 +0000 (15:55 -0400)

Trivial merge