Merge remote-tracking branch 'u-boot-atmel/master' into m
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 4 Sep 2012 21:21:12 +0000 (23:21 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 4 Sep 2012 21:21:12 +0000 (23:21 +0200)

Trivial merge