Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <[email protected]>
Sat, 16 Jan 2016 13:30:49 +0000 (08:30 -0500)
committerTom Rini <[email protected]>
Sat, 16 Jan 2016 13:30:49 +0000 (08:30 -0500)

Trivial merge