Merge branch 'master' of git://git.denx.de/u-boot-atmel
authorTom Rini <trini@ti.com>
Mon, 26 Jan 2015 11:42:40 +0000 (06:42 -0500)
committerTom Rini <trini@ti.com>
Mon, 26 Jan 2015 11:42:40 +0000 (06:42 -0500)

Trivial merge