From cb5ed6d2fcd38b6d3eee8e9f47b9458d6e3a47d4 Mon Sep 17 00:00:00 2001
From: Darren Hart <dvhart@linux.intel.com>
Date: Tue, 10 Jan 2012 15:41:10 -0800
Subject: [PATCH] --- yaml --- r: 285819 b: refs/heads/master c:
 041b78c89b1fe68f44c45e8b6cc6c9f8ea8f0e4c h: refs/heads/master i:   285817:
 6d38d214207243da41bcf0b290e001902136957c   285815:
 cfda7933564ec8ad90fa28c9a5957b21f0c92bcd v: v3

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

diff --git a/[refs] b/[refs]
index 30144121e872..44a1905d3bb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b5f72145e3ba85e38240dba844ebe1fcbb73713
+refs/heads/master: 041b78c89b1fe68f44c45e8b6cc6c9f8ea8f0e4c
diff --git a/trunk/scripts/kconfig/merge_config.sh b/trunk/scripts/kconfig/merge_config.sh
index 890276bd1e67..b91015df96aa 100644
--- a/trunk/scripts/kconfig/merge_config.sh
+++ b/trunk/scripts/kconfig/merge_config.sh
@@ -24,7 +24,7 @@ clean_up() {
        rm -f $TMP_FILE
        exit
 }
-trap clean_up SIGHUP SIGINT SIGTERM
+trap clean_up HUP INT TERM
 
 usage() {
 	echo "Usage: $0 [OPTIONS] [CONFIG [...]]"