| commit | 10e167329b029890a4c704f094822da5f259b886 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Sat Jun 08 14:35:10 2013 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Sat Jun 08 14:35:10 2013 +0200 |
| tree | c0950b7cb928ee26b07c39348e4539602ce3aec9 | |
| parent | dbc000bfb51eb30d786521e6b8e29048c36cbefa [diff] | |
| parent | 4a1c7b13ae104d4526d3176793b7f6b06694df15 [diff] |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Conflicts: drivers/serial/Makefile