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

Trivial merge