Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 2 Dec 2013 15:00:10 +0000 (16:00 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 2 Dec 2013 15:00:10 +0000 (16:00 +0100)

Trivial merge