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

Trivial merge