From 0a72fd5ba09cacf1f0d9e2f1533fdbbc14162be7 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Wed, 1 Feb 2012 12:01:58 -0500
Subject: [PATCH] --- yaml --- r: 298204 b: refs/heads/master c:
 09280615a0d924b3ab79acbff950f92c3420fd76 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/scripts/kconfig/merge_config.sh | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d3b4db4d5c1e..ba1a5c99e183 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d09598d488f081e3be23f885ed65cbbe2d073b5
+refs/heads/master: 09280615a0d924b3ab79acbff950f92c3420fd76
diff --git a/trunk/scripts/kconfig/merge_config.sh b/trunk/scripts/kconfig/merge_config.sh
index ceadf0e150cf..23d738a1acda 100644
--- a/trunk/scripts/kconfig/merge_config.sh
+++ b/trunk/scripts/kconfig/merge_config.sh
@@ -58,12 +58,16 @@ while true; do
 	esac
 done
 
-
+INITFILE=$1
+shift;
 
 MERGE_LIST=$*
 SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
 TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
 
+echo "Using $INITFILE as base"
+cat $INITFILE > $TMP_FILE
+
 # Merge files, printing warnings on overrided values
 for MERGE_FILE in $MERGE_LIST ; do
 	echo "Merging $MERGE_FILE"