Merge git://www.denx.de/git/u-boot
authorNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Sat, 22 Sep 2007 16:29:43 +0000 (01:29 +0900)
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Sat, 22 Sep 2007 16:29:43 +0000 (01:29 +0900)
commitb8685affe614ccf5f4ec66252b30e2e524d18948
tree05bc55b8a4a0451e6500f1f52651d81c0f48f012
parent69df3c4da0c93017cceb25a366e794570bd0ed98
parent66dcad3a9a53e0766d90e0084123bd8529522fb0
Merge git://www.denx.de/git/u-boot

Conflicts:

CREDITS
CREDITS
Makefile
common/cmd_bootm.c
drivers/Makefile