Merge git://git.denx.de/u-boot-fdt
authorTom Rini <trini@ti.com>
Thu, 23 Oct 2014 10:51:46 +0000 (06:51 -0400)
committerTom Rini <trini@ti.com>
Thu, 23 Oct 2014 10:51:46 +0000 (06:51 -0400)

Trivial merge