Merge branch 'master' of git://git.denx.de/u-boot-dm
authorTom Rini <trini@konsulko.com>
Sun, 8 Mar 2015 12:15:23 +0000 (08:15 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 8 Mar 2015 12:15:23 +0000 (08:15 -0400)

Trivial merge