| commit | cfb8ff2b18bf80826f1b692763f56c4305eb1c43 | [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 | af0464f9ffad437867870fc447a85dfe9569b383 [diff] | |
| parent | a7f95ebcf059f7ccb9727bdedb4f7d8b52bb1fc0 [diff] |
Merge remote-tracking branch 'u-boot-imx/master' The single file conflict below is actually trivial. Conflicts: board/boundary/nitrogen6x/nitrogen6x.c