| commit | a73f0043242bde0f2e8355e9224f20833283f8c1 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Mon Jan 06 08:49:58 2014 +0100 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Mon Jan 06 08:49:58 2014 +0100 |
| tree | 9a5d44eb1fcca45dfd30557318f786b66392a8f3 | |
| parent | 5f6476abc79cf34c5b92847db9eea1043a43fc9d [diff] | |
| parent | a1d1ff612cf4b2e6306ea0a8707bacac1ff82920 [diff] |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Conflicts: include/micrel.h The conflict above was trivial, caused by four lines being added in both branches with different whitepace.