| commit | 7e08a1f2774453c5482654414891f20276dba715 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Mon Nov 24 12:01:48 2014 -0500 |
| committer | Tom Rini <trini@ti.com> | Mon Nov 24 12:01:48 2014 -0500 |
| tree | 56fe759e62f129dc055b6f6a22f299f6c8b5cdde | |
| parent | b660ae76be745776d7c40e07cd2cfb5c1d4665ad [diff] | |
| parent | 927609a220e5942bf881b0e5d57acfb481ffbf11 [diff] |
Merge git://git.denx.de/u-boot-dm Conflicts: drivers/serial/serial-uclass.c Signed-off-by: Tom Rini <trini@ti.com>