Merge branch 'master' of git://git.denx.de/u-boot-atmel
authorTom Rini <trini@konsulko.com>
Thu, 14 May 2015 10:59:30 +0000 (06:59 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 14 May 2015 10:59:30 +0000 (06:59 -0400)

Trivial merge