Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@konsulko.com>
Thu, 15 Oct 2015 21:45:39 +0000 (17:45 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 15 Oct 2015 21:45:39 +0000 (17:45 -0400)

Trivial merge