Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 5 Nov 2013 19:50:39 +0000 (20:50 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 5 Nov 2013 19:50:39 +0000 (20:50 +0100)

Trivial merge