| commit | 99070db0dc0b0e881841a0091f06d53351244a34 | [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 | 7f14f30a6d6c80f9fbe3fd8d5b0c294575e3094e [diff] | |
| parent | 39826f09978a0a7070999acc15babf88f03e4051 [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>