Merge remote-tracking branch 'u-boot-atmel/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 26 Oct 2012 05:54:25 +0000 (07:54 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 26 Oct 2012 05:54:25 +0000 (07:54 +0200)

Trivial merge