Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@konsulko.com>
Tue, 5 May 2015 11:00:11 +0000 (07:00 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 5 May 2015 11:00:11 +0000 (07:00 -0400)

Trivial merge