From e67d59c8ca471447559f3bb3ecfde1adbcb06f2f Mon Sep 17 00:00:00 2001
From: John Stultz <john.stultz@linaro.org>
Date: Thu, 22 Mar 2012 15:05:48 -0700
Subject: [PATCH] --- yaml --- r: 298205 b: refs/heads/master c:
 55cae3043a48e01f8fc31e8aecc3062c4767a27d h: refs/heads/master i:   298203:
 6e81c802f2c36751b9a594cc0aa554076c613a42 v: v3

---
 [refs]                                | 2 +-
 trunk/scripts/kconfig/merge_config.sh | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 trunk/scripts/kconfig/merge_config.sh

diff --git a/[refs] b/[refs]
index ba1a5c99e183..7d753124c280 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09280615a0d924b3ab79acbff950f92c3420fd76
+refs/heads/master: 55cae3043a48e01f8fc31e8aecc3062c4767a27d
diff --git a/trunk/scripts/kconfig/merge_config.sh b/trunk/scripts/kconfig/merge_config.sh
old mode 100644
new mode 100755