| commit | 19d829fa60fc4e6df514a046142faaaf9fc8185d | [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 | e62d5fb0da76ef168e90cae9bbbda80349aaf137 [diff] | |
| parent | 8467faef7fce8c5faad7224b7737a58e16c52186 [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.