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

Trivial merge