Merge git://www.denx.de/git/u-boot
authorGerald Van Baren <vanbaren@cideas.com>
Fri, 10 Aug 2007 23:19:50 +0000 (19:19 -0400)
committerGerald Van Baren <vanbaren@cideas.com>
Fri, 10 Aug 2007 23:19:50 +0000 (19:19 -0400)

Trivial merge