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

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

Conflicts:

	cpu/arm920t/ep93xx/timer.c

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

45e565337a90bbca0c1bb712b5e008b7c0b18bd5