| commit | a1a0ad65ea562acfeed7b69d64203baab8d80e50 | [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 | 642a4446c5cd43207582651781b395b11a660269 [diff] | |
| parent | a03908e7edaf8c888eece5945ab5bdb25ef6fd40 [diff] |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Conflicts: drivers/serial/Makefile