Merge branch 'master' of git://git.denx.de/u-boot-fdt
authorTom Rini <trini@konsulko.com>
Sat, 3 Oct 2015 14:48:06 +0000 (10:48 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 3 Oct 2015 14:48:06 +0000 (10:48 -0400)

Trivial merge