From: Tom Rini <trini@ti.com>
Date: Sat, 20 Oct 2012 01:23:38 +0000 (-0700)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Url: http://git.dujemihanovic.xyz/%22/img/sics.gif/%22/static/git-favicon.png?a=commitdiff_plain;h=99070db0dc0b0e881841a0091f06d53351244a34;p=u-boot.git

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

99070db0dc0b0e881841a0091f06d53351244a34