Merge git://git.denx.de/u-boot-fdt
authorTom Rini <[email protected]>
Fri, 25 Nov 2016 22:40:02 +0000 (17:40 -0500)
committerTom Rini <[email protected]>
Fri, 25 Nov 2016 22:40:02 +0000 (17:40 -0500)

Trivial merge