Merge branch 'master' of git://git.denx.de/u-boot-fdt
authorTom Rini <trini@ti.com>
Thu, 29 Nov 2012 13:41:56 +0000 (06:41 -0700)
committerTom Rini <trini@ti.com>
Thu, 29 Nov 2012 13:41:56 +0000 (06:41 -0700)

Trivial merge