Merge branch 'master' of git://git.denx.de/u-boot-fdt
authorTom Rini <trini@ti.com>
Tue, 20 Nov 2012 17:46:30 +0000 (10:46 -0700)
committerTom Rini <trini@ti.com>
Tue, 20 Nov 2012 17:46:30 +0000 (10:46 -0700)

Trivial merge