Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 24 Jun 2014 17:54:20 +0000 (19:54 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 24 Jun 2014 17:54:20 +0000 (19:54 +0200)
commit754466ac95e92ebf40e25c6af6f13ab9b4d7c87b
treea63da2cacba9786c93f209a7f44c663c50d768a7
parentaed39f354eb663bce7bfbf54c89397b14da2ed64
parent6dbeb893c4a7668d0098318d6668ccf59bfbfdea
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'