Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <trini@konsulko.com>
Sat, 3 Oct 2015 00:35:49 +0000 (20:35 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 3 Oct 2015 00:35:49 +0000 (20:35 -0400)

Trivial merge