Merge branch 'master' of http://git.denx.de/u-boot-samsung
authorTom Rini <trini@konsulko.com>
Thu, 11 Jun 2015 01:45:51 +0000 (21:45 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 11 Jun 2015 01:45:51 +0000 (21:45 -0400)

Trivial merge