| commit | b1432102d2dd04b33f5d2154c88f01998e9c37a5 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Thu Sep 05 11:15:26 2013 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Thu Sep 05 11:15:26 2013 +0200 |
| tree | 295c75b0d9f3c7180f23ec131442286cf91db5b1 | |
| parent | 5366e36c9aa8b7b7b04c452fa2630615b101b237 [diff] | |
| parent | 2c37d3bc2ac38518d572fcd2d4f8e334cf31fcb9 [diff] |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Conflicts: drivers/serial/serial.c The conflict above was a trivial case of adding one init function in each branch, and manually resolved in merge.