Merge with git://www.denx.de/git/u-boot.git
authorPeter Pearse <peter.pearse@arm.com>
Fri, 18 May 2007 13:34:19 +0000 (14:34 +0100)
committerPeter Pearse <peter.pearse@arm.com>
Fri, 18 May 2007 13:34:19 +0000 (14:34 +0100)

Trivial merge