From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Thu, 6 Dec 2007 16:20:16 +0000 (+0900)
Subject: Merge git://www.denx.de/git/u-boot
X-Git-Tag: v2013.04~6340^2^2~2
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=521dcd30b9cc5b72cd27ae04104f19369251aa20;p=bsp%2Fu-boot.git

Merge git://www.denx.de/git/u-boot

Conflicts:

	drivers/Makefile
---

521dcd30b9cc5b72cd27ae04104f19369251aa20