| commit | c9cc7d76074bf1b45bce1d1813a620c75a2ce9e6 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Fri Oct 19 18:23:38 2012 -0700 |
| committer | Tom Rini <trini@ti.com> | Fri Oct 19 18:23:38 2012 -0700 |
| tree | f54a53d89cf1125c8fe433bc51539144de43074c | |
| parent | 313d448d82266a74cb3a6751879e31921e830cfc [diff] | |
| parent | d4678237e7394fba2129620e8aa73b90ee31c1e2 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm Conflicts: drivers/serial/serial_lh7a40x.c Signed-off-by: Tom Rini <trini@ti.com>