Merge git://www.denx.de/git/u-boot
authorNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Thu, 6 Dec 2007 16:20:16 +0000 (01:20 +0900)
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Thu, 6 Dec 2007 16:20:16 +0000 (01:20 +0900)
commit521dcd30b9cc5b72cd27ae04104f19369251aa20
treebc33710a3ae6f97f0dcae8f02fd6f3c91322d96d
parent260eea5676ca46903a335686cc020b29c4ca46fe
parent8d4f040a3c15036a6ea25a9c39e7d89fefa8440d
Merge git://www.denx.de/git/u-boot

Conflicts:

drivers/Makefile
MAKEALL
Makefile
common/cmd_ide.c