Merge with git://www.denx.de/git/u-boot.git
authorPeter Pearse <peter.pearse@arm.com>
Thu, 15 Nov 2007 08:43:40 +0000 (08:43 +0000)
committerPeter Pearse <peter.pearse@arm.com>
Thu, 15 Nov 2007 08:43:40 +0000 (08:43 +0000)

Trivial merge