Merge remote-tracking branch 'u-boot-atmel/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 29 Sep 2012 06:34:09 +0000 (08:34 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 29 Sep 2012 06:34:09 +0000 (08:34 +0200)

Trivial merge