Merge git://www.denx.de/git/u-boot
authorKim Phillips <kim.phillips@freescale.com>
Wed, 11 Jul 2007 22:48:09 +0000 (17:48 -0500)
committerKim Phillips <kim.phillips@freescale.com>
Wed, 11 Jul 2007 22:48:09 +0000 (17:48 -0500)

Trivial merge