Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 10 May 2013 22:06:03 +0000 (00:06 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 10 May 2013 22:06:03 +0000 (00:06 +0200)

Trivial merge