Merge with /home/sr/git/u-boot/denx

CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index d2cfb63..6b219d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,8 @@
 * Fix CONFIG_CMDLINE_EDITING implementation
   Patch by Stefan Roese, 27 Jul 2006
 
+* Fix preboot message on TQM5200 after switching to hush parser.
+
 * MCC200: set default configuration to low_boot DDR,
   and support for configurable options high_boot and/or SDRAM.
 

include/configs/TQM5200.h

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 717af86..be83b67 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -191,7 +191,7 @@
 #define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
 
 #define CONFIG_PREBOOT	"echo;" \
-	"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+	"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
 	"echo"
 
 #undef	CONFIG_BOOTARGS