Merge git://www.denx.de/git/u-boot
authorNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Wed, 28 Nov 2007 15:56:37 +0000 (00:56 +0900)
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Wed, 28 Nov 2007 15:56:37 +0000 (00:56 +0900)
commit7fc792895be3c0edf423c4038992b40345672a12
tree6247dce2d1e72aa17fd2d7a138af66158d02f319
parenteda3e1e6619ad0bee94ae4b16c99d88e77e2af13
parentf92edbd8a0ef16a2b9127cbb564c09685728e4b0
Merge git://www.denx.de/git/u-boot

Conflicts:

drivers/Makefile
Makefile
common/cmd_bootm.c
common/cmd_ide.c