Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <[email protected]>
Tue, 5 Nov 2013 19:50:39 +0000 (20:50 +0100)
committerAlbert ARIBAUD <[email protected]>
Tue, 5 Nov 2013 19:50:39 +0000 (20:50 +0100)

Trivial merge