Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <trini@konsulko.com>
Tue, 29 Mar 2016 17:33:13 +0000 (13:33 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 29 Mar 2016 17:33:13 +0000 (13:33 -0400)

Trivial merge