From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Wed, 28 Nov 2007 15:56:37 +0000 (+0900)
Subject: Merge git://www.denx.de/git/u-boot
X-Git-Tag: v2025.01-rc5-pxa1908~22631^2^2~9
X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-logo.png?a=commitdiff_plain;h=7fc792895be3c0edf423c4038992b40345672a12;p=u-boot.git

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

Conflicts:

	drivers/Makefile
---

7fc792895be3c0edf423c4038992b40345672a12