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)
commitd627eefcd5e72db00889718ca9ee1dcb4d026fc9
tree92db88f447dcec6b071af2b55182637c0921159e
parentfe7f0810ddf41939bbdd22fe39b0b80fdfe0636b
parentf90aea2a65e71a37ff029849d908538ae9e98283
Merge remote-tracking branch 'u-boot-pxa/master' into 'u-boot-arm/master'