Merge branch 'master' of git://git.denx.de/u-boot-samsung
authorTom Rini <[email protected]>
Tue, 4 Nov 2014 12:00:48 +0000 (07:00 -0500)
committerTom Rini <[email protected]>
Tue, 4 Nov 2014 12:00:48 +0000 (07:00 -0500)

Trivial merge