Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 19 Sep 2013 16:01:55 +0000 (18:01 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 19 Sep 2013 16:01:55 +0000 (18:01 +0200)

Trivial merge