Merge remote-tracking branch 'u-boot-pxa/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 18 Dec 2013 21:19:02 +0000 (22:19 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 18 Dec 2013 21:19:02 +0000 (22:19 +0100)

Trivial merge