Tom Rini 99070db0dc 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>
2012-10-19 18:23:38 -07:00
..
2010-10-27 22:48:30 +02:00
2012-10-16 18:00:36 +02:00