| commit | 1739564e753bc3a8097f8937a3cbe738bdaaed5d | [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 | 746667f1e56bf08d03e66a178df3c4f4f6c806e1 [diff] | |
| parent | 17b28edb37a33d0c89089faf36e4edd7084f65fa [diff] |
Merge git://git.denx.de/u-boot-dm Conflicts: drivers/serial/serial-uclass.c Signed-off-by: Tom Rini <trini@ti.com>