Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Sat, 20 Oct 2012 01:23:38 +0000 (18:23 -0700)
committerTom Rini <trini@ti.com>
Sat, 20 Oct 2012 01:23:38 +0000 (18:23 -0700)
commit99070db0dc0b0e881841a0091f06d53351244a34
treef54a53d89cf1125c8fe433bc51539144de43074c
parent7f14f30a6d6c80f9fbe3fd8d5b0c294575e3094e
parent39826f09978a0a7070999acc15babf88f03e4051
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>
MAINTAINERS
boards.cfg