Merge git://www.denx.de/git/u-boot
authorKim Phillips <kim.phillips@freescale.com>
Mon, 23 Apr 2007 20:58:17 +0000 (15:58 -0500)
committerKim Phillips <kim.phillips@freescale.com>
Mon, 23 Apr 2007 20:58:17 +0000 (15:58 -0500)

Trivial merge