Merge branch 'master' of git://git.denx.de/u-boot-atmel
authorTom Rini <trini@konsulko.com>
Fri, 20 Mar 2015 11:01:00 +0000 (07:01 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 20 Mar 2015 11:01:00 +0000 (07:01 -0400)

Trivial merge