commit | c24949a76b99825b63bc2ce9fe47ec7ede392252 | [log] [tgz] |
---|---|---|
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Sep 09 09:19:10 2014 +0200 |
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Sep 09 09:19:10 2014 +0200 |
tree | b3e93d9948b17e4c924012684b0f2fecdf547176 | |
parent | b65115889584e877f216ee45b53fc935f012e735 [diff] | |
parent | 72e80a83d6682b42b8590978d3055ae1aa592648 [diff] |
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'