From ed67a3aa36d0dbc2f699472ce9eb3f38dce978a5 Mon Sep 17 00:00:00 2001
From: Darren Hart <dvhart@linux.intel.com>
Date: Tue, 10 Jan 2012 15:41:12 -0800
Subject: [PATCH] --- yaml --- r: 285820 b: refs/heads/master c:
 c0c0cda276b796e9c9710672b3bb4a737dbb4900 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 44a1905d3bb1..db6fb7e9c9ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 041b78c89b1fe68f44c45e8b6cc6c9f8ea8f0e4c
+refs/heads/master: c0c0cda276b796e9c9710672b3bb4a737dbb4900
diff --git a/trunk/scripts/kconfig/merge_config.sh b/trunk/scripts/kconfig/merge_config.sh
index b91015df96aa..07bb8863577b 100644
--- a/trunk/scripts/kconfig/merge_config.sh
+++ b/trunk/scripts/kconfig/merge_config.sh
@@ -21,8 +21,8 @@
 #  See the GNU General Public License for more details.
 
 clean_up() {
-       rm -f $TMP_FILE
-       exit
+	rm -f $TMP_FILE
+	exit
 }
 trap clean_up HUP INT TERM