Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 5 Sep 2013 10:04:49 +0000 (12:04 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 5 Sep 2013 10:04:49 +0000 (12:04 +0200)

Trivial merge