Commits
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>
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>