Merge branch 'master' of git://git.denx.de/u-boot-samsung
authorTom Rini <trini@konsulko.com>
Sat, 8 Apr 2017 14:20:26 +0000 (10:20 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 8 Apr 2017 14:20:26 +0000 (10:20 -0400)

Trivial merge