Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@konsulko.com>
Tue, 7 Jul 2015 12:42:35 +0000 (08:42 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 7 Jul 2015 12:42:35 +0000 (08:42 -0400)

Trivial merge