Merge branch 'master' of git://git.denx.de/u-boot
authorKim Phillips <kim.phillips@freescale.com>
Thu, 19 Feb 2009 17:06:58 +0000 (11:06 -0600)
committerKim Phillips <kim.phillips@freescale.com>
Thu, 19 Feb 2009 17:06:58 +0000 (11:06 -0600)

Trivial merge