tree f54a53d89cf1125c8fe433bc51539144de43074c
parent 7f14f30a6d6c80f9fbe3fd8d5b0c294575e3094e
parent 39826f09978a0a7070999acc15babf88f03e4051
author Tom Rini <trini@ti.com> 1350696218 -0700
committer Tom Rini <trini@ti.com> 1350696218 -0700

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>