| commit | 33f6964cc5a27a3bb78c3caec303ec56b23cb9b2 | [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 | f23f4b95e3a059ac364e599a47cf0366f5adfa63 [diff] | |
| parent | 504166ef2142d1500f56507fa81901649aec7363 [diff] |
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'