Merge branch 'master' of git://git.denx.de/u-boot-atmel
authorTom Rini <trini@konsulko.com>
Sat, 20 Feb 2016 22:32:48 +0000 (17:32 -0500)
committerTom Rini <trini@konsulko.com>
Sat, 20 Feb 2016 22:32:48 +0000 (17:32 -0500)

Trivial merge