Merge branch 'master' of git://git.denx.de/u-boot-samsung
authorTom Rini <trini@konsulko.com>
Tue, 18 Aug 2015 12:24:32 +0000 (08:24 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 18 Aug 2015 12:24:32 +0000 (08:24 -0400)

Trivial merge