Merge branch 'master' of http://www.denx.de/git/u-boot
authorJon Loeliger <jdl@freescale.com>
Wed, 11 Oct 2006 15:16:01 +0000 (10:16 -0500)
committerJon Loeliger <jdl@freescale.com>
Wed, 11 Oct 2006 15:16:01 +0000 (10:16 -0500)

Trivial merge