Merge git://www.denx.de/git/u-boot
authorKim Phillips <kim.phillips@freescale.com>
Wed, 20 Jun 2007 17:22:52 +0000 (12:22 -0500)
committerKim Phillips <kim.phillips@freescale.com>
Wed, 20 Jun 2007 17:22:52 +0000 (12:22 -0500)

Trivial merge