Merge git://www.denx.de/git/u-boot
authorBen Warren <bwarren@saruman.qstreams.net>
Fri, 2 Nov 2007 15:20:41 +0000 (11:20 -0400)
committerBen Warren <bwarren@saruman.qstreams.net>
Fri, 2 Nov 2007 15:20:41 +0000 (11:20 -0400)

Trivial merge