| commit | 740f41d3cbefe2068247852220226c2c3b287249 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Mon Jul 28 10:12:45 2014 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Mon Jul 28 10:12:45 2014 +0200 |
| tree | a8afb3f0e3f0b7d4574cbbfd2e8d780db6b4ae08 | |
| parent | f2c8d7f591e28d3437155c7a6eae8c8d9e3fe552 [diff] | |
| parent | 7c48b015100eeff0e1bbb766394f7beca23afb48 [diff] |
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'