Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <trini@konsulko.com>
Fri, 5 Aug 2016 18:09:15 +0000 (14:09 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 6 Aug 2016 00:55:30 +0000 (20:55 -0400)

Trivial merge