From: Wolfgang Denk Date: Fri, 29 Oct 2010 20:03:00 +0000 (+0200) Subject: Merge branch 'master' of git://git.denx.de/u-boot-marvell X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=0c0892be0d93a5a892b93739c5eb3bf692fed4ff;p=u-boot.git Merge branch 'master' of git://git.denx.de/u-boot-marvell Conflicts: include/configs/km_arm.h Signed-off-by: Wolfgang Denk --- 0c0892be0d93a5a892b93739c5eb3bf692fed4ff