Merge branch 'master' of git://git.denx.de/u-boot-coldfire
authorTom Rini <trini@konsulko.com>
Sun, 16 Sep 2018 14:32:33 +0000 (10:32 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 16 Sep 2018 14:32:33 +0000 (10:32 -0400)

Trivial merge