tree 92db88f447dcec6b071af2b55182637c0921159e
parent fe7f0810ddf41939bbdd22fe39b0b80fdfe0636b
parent f90aea2a65e71a37ff029849d908538ae9e98283
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'