Merge branch 'master' of rsync://rsync.denx.de/git/u-boot
authorKumar Gala <galak@kernel.crashing.org>
Thu, 20 Apr 2006 17:25:10 +0000 (12:25 -0500)
committerKumar Gala <galak@kernel.crashing.org>
Thu, 20 Apr 2006 17:25:10 +0000 (12:25 -0500)

Trivial merge