Merge branch 'master' of git://git.denx.de/u-boot-atmel
authorTom Rini <[email protected]>
Mon, 13 Jun 2016 12:50:58 +0000 (08:50 -0400)
committerTom Rini <[email protected]>
Mon, 13 Jun 2016 12:50:58 +0000 (08:50 -0400)

Trivial merge