diff --git a/[refs] b/[refs]
index 64ff343ebafa..21ca6f91d66d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 320d41bb1597799669bab28a047f9868dd754aca
+refs/heads/master: c55ac154019f628b42316bc21545ee1b2bee3db6
diff --git a/trunk/scripts/kconfig/mconf.c b/trunk/scripts/kconfig/mconf.c
index 19e200d91120..86cd1ea35579 100644
--- a/trunk/scripts/kconfig/mconf.c
+++ b/trunk/scripts/kconfig/mconf.c
@@ -830,6 +830,7 @@ static int handle_exit(void)
 		fprintf(stderr, _("\n\n"
 				  "Your configuration changes were NOT saved."
 				  "\n\n"));
+		res = 0;
 	}
 
 	return res;