Merge branch 'master' of git://git.denx.de/u-boot-coldfire
authorTom Rini <trini@konsulko.com>
Mon, 26 Sep 2016 13:31:01 +0000 (09:31 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 26 Sep 2016 13:31:01 +0000 (09:31 -0400)

Trivial merge