Merge branch 'master' of git://git.denx.de/u-boot-fdt
authorTom Rini <trini@ti.com>
Mon, 17 Sep 2012 18:34:08 +0000 (11:34 -0700)
committerTom Rini <trini@ti.com>
Mon, 17 Sep 2012 18:34:08 +0000 (11:34 -0700)

Trivial merge