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

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

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

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

922d27b596c179c5a7d68abe45ede5adb1b6589c