| commit | 4b19b7448e63bab8af17abbb30acff00d8f0dc99 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Wed Oct 08 21:20:49 2014 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Wed Oct 08 21:20:49 2014 +0200 |
| tree | 6ba89c10ebffb00cee92656da9a5aad8396390c0 | |
| parent | c19a8bc5711ec63e905ef91f045a1489f0aa3cb0 [diff] | |
| parent | 5e3a388cddce1685ccd9bc1b58ddb89a191ed88f [diff] |
Merge remote-tracking branch 'u-boot-imx/master' The single file conflict below is actually trivial. Conflicts: board/boundary/nitrogen6x/nitrogen6x.c