From: Minkyu Kang <mk7.kang@samsung.com>
Date: Mon, 10 May 2010 06:20:50 +0000 (+0900)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: v2010.09-rc1~28^2~7^2~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9d62f20d0861ef87460d073dc189c851715b46ae;p=u-boot

Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:
	arch/arm/include/asm/mach-types.h
	common/serial.c

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---

9d62f20d0861ef87460d073dc189c851715b46ae