From dd482fd18205b38beb010062bdb403098c4a3dcc Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Thu, 22 Nov 2012 01:06:04 +0100
Subject: [PATCH] --- yaml --- r: 359235 b: refs/heads/master c:
 c2838e6ee2d2eae893646f9a271039ae434ed760 h: refs/heads/master i:   359233:
 57b63b9ba149d5049ea6d8bb84f305afa653ce5c   359231:
 963d80a038f090b203633f9d950c34ae03527c0f v: v3

---
 [refs]                         | 2 +-
 trunk/scripts/kconfig/Makefile | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 58a98dd6b9c1..5ceac2d2502e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 409f117e2d6b38d714ab26def840801e33dfe115
+refs/heads/master: c2838e6ee2d2eae893646f9a271039ae434ed760
diff --git a/trunk/scripts/kconfig/Makefile b/trunk/scripts/kconfig/Makefile
index 3091794e9354..231b4759c714 100644
--- a/trunk/scripts/kconfig/Makefile
+++ b/trunk/scripts/kconfig/Makefile
@@ -11,6 +11,9 @@ else
 Kconfig := Kconfig
 endif
 
+# We need this, in case the user has it in its environment
+unexport CONFIG_
+
 xconfig: $(obj)/qconf
 	$< $(Kconfig)