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