Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <trini@konsulko.com>
Thu, 12 Nov 2015 20:59:35 +0000 (15:59 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 13 Nov 2015 00:32:51 +0000 (19:32 -0500)

Trivial merge