Merge with git://www.denx.de/git/u-boot.git
authorPeter Pearse <peter.pearse@arm.com>
Thu, 4 Oct 2007 10:00:44 +0000 (11:00 +0100)
committerPeter Pearse <peter.pearse@arm.com>
Thu, 4 Oct 2007 10:00:44 +0000 (11:00 +0100)

Trivial merge