Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 4 Sep 2013 09:50:25 +0000 (11:50 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 4 Sep 2013 09:50:25 +0000 (11:50 +0200)

Trivial merge