Merge branch 'master' of git://git.denx.de/u-boot-fdt
authorTom Rini <trini@konsulko.com>
Fri, 24 Apr 2015 19:07:19 +0000 (15:07 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 24 Apr 2015 19:07:19 +0000 (15:07 -0400)

Trivial merge