Merge branch 'u-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 7 Jul 2015 09:38:44 +0000 (11:38 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 7 Jul 2015 09:38:44 +0000 (11:38 +0200)

Trivial merge