Merge branch 'master' of git://git.denx.de/u-boot-samsung
authorTom Rini <trini@konsulko.com>
Fri, 23 Dec 2016 15:17:22 +0000 (10:17 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 23 Dec 2016 15:17:22 +0000 (10:17 -0500)

Trivial merge