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)
commite825b100d209a9d3c79b2998452cafa94eec986a
treee1654c4d745839eba8d37f67d15acde79382e23e
parentb03b25caea1ff3a501161f5bc1ad5e5b5b124e0c
parent66a62ce0dc48d2319938c72f34a562f519c5d5c2
Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'