tree 92db88f447dcec6b071af2b55182637c0921159e
parent 0525f802f4e4ec406e3e46dca6b23dae00f92422
parent 7982fe5757d83c4475559ea346427e74c4943423
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1387401542 +0100
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1387401542 +0100

Merge remote-tracking branch 'u-boot-pxa/master' into 'u-boot-arm/master'