From: Wolfgang Denk <wd@denx.de>
Date: Fri, 29 Oct 2010 20:03:00 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-marvell
X-Git-Tag: v2010.12-rc2~82
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c0892be0d93a5a892b93739c5eb3bf692fed4ff;p=kernel%2Fu-boot.git

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

Conflicts:
	include/configs/km_arm.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

0c0892be0d93a5a892b93739c5eb3bf692fed4ff