Merge branch 'master' of git://git.denx.de/u-boot-fdt
authorTom Rini <trini@ti.com>
Tue, 23 Oct 2012 02:54:48 +0000 (19:54 -0700)
committerTom Rini <trini@ti.com>
Tue, 23 Oct 2012 02:54:48 +0000 (19:54 -0700)

Trivial merge