Merge git://www.denx.de/git/u-boot into uboot
authorGerald Van Baren <vanbaren@cideas.com>
Fri, 21 Mar 2008 15:42:54 +0000 (11:42 -0400)
committerGerald Van Baren <vanbaren@cideas.com>
Fri, 21 Mar 2008 15:42:54 +0000 (11:42 -0400)

Trivial merge