Merge with git://www.denx.de/git/u-boot.git
authorPeter Pearse <peter.pearse@arm.com>
Tue, 11 Sep 2007 14:31:55 +0000 (15:31 +0100)
committerPeter Pearse <peter.pearse@arm.com>
Tue, 11 Sep 2007 14:31:55 +0000 (15:31 +0100)

Trivial merge