Merge git://www.denx.de/git/u-boot
authorBen Warren <bwarren@saruman.qstreams.net>
Tue, 6 Nov 2007 15:17:40 +0000 (10:17 -0500)
committerBen Warren <bwarren@saruman.qstreams.net>
Tue, 6 Nov 2007 15:17:40 +0000 (10:17 -0500)

Trivial merge