Merge branch 'master' of git://git.denx.de/u-boot-atmel
authorTom Rini <trini@konsulko.com>
Thu, 1 Oct 2015 11:53:15 +0000 (07:53 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 1 Oct 2015 11:53:15 +0000 (07:53 -0400)

Trivial merge