Merge branch 'master' of git://git.denx.de/u-boot-samsung
authorTom Rini <trini@konsulko.com>
Wed, 6 Jun 2018 13:08:16 +0000 (09:08 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 6 Jun 2018 13:08:16 +0000 (09:08 -0400)

Trivial merge