Merge branch 'master' of git://www.denx.de/git/u-boot
authorKim Phillips <kim.phillips@freescale.com>
Mon, 24 Sep 2007 19:43:43 +0000 (14:43 -0500)
committerKim Phillips <kim.phillips@freescale.com>
Mon, 24 Sep 2007 19:43:43 +0000 (14:43 -0500)

Trivial merge