Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Mon, 2 Mar 2015 02:06:33 +0000 (21:06 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 2 Mar 2015 02:06:33 +0000 (21:06 -0500)

Trivial merge