Merge branch 'master' of git://git.denx.de/u-boot-atmel
authorTom Rini <trini@konsulko.com>
Tue, 31 Mar 2015 23:15:59 +0000 (19:15 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 31 Mar 2015 23:15:59 +0000 (19:15 -0400)

Trivial merge