Merge branch 'master' of git://git.denx.de/u-boot-samsung
authorTom Rini <trini@konsulko.com>
Mon, 27 Jun 2016 15:31:23 +0000 (11:31 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 27 Jun 2016 15:31:23 +0000 (11:31 -0400)

Trivial merge