Merge branch 'master' of git://git.denx.de/u-boot-fdt
authorTom Rini <trini@ti.com>
Wed, 18 Feb 2015 13:46:50 +0000 (08:46 -0500)
committerTom Rini <trini@ti.com>
Wed, 18 Feb 2015 13:46:50 +0000 (08:46 -0500)

Trivial merge