Merge with /home/wd/git/u-boot/master

CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index f5a16d8..24a43cb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Fix compiler warning
+
 * Fix FEC PHY addresses for TQM85xx boards
 
 * Fix uninitialized variable problem in hush shell

common/main.c

diff --git a/common/main.c b/common/main.c
index 2922624..1389958 100644
--- a/common/main.c
+++ b/common/main.c
@@ -26,6 +26,9 @@
 #include <common.h>
 #include <watchdog.h>
 #include <command.h>
+#ifdef CONFIG_MODEM_SUPPORT
+#include <malloc.h>		/* for free() prototype */
+#endif
 
 #ifdef CFG_HUSH_PARSER
 #include <hush.h>