Maverick request pull, CONFIG_NL80211_TESTMODE=n

[Tim Gardner]

The following changes since commit af791e9e08878bd7ed34a9452f8cdb40d28bbd1c:
  Andy Whitcroft (1):
        UBUNTU: SAUCE: fbcon -- fix OOPs triggered by race prevention fixes

are available in the git repository at:

  git://kernel.ubuntu.com/rtg/ubuntu-maverick.git NL80211_TESTMODE

Tim Gardner (1):
      UBUNTU: [Config] CONFIG_NL80211_TESTMODE=n

 debian.master/config/config.common.ports  |    2 +-
 debian.master/config/config.common.ubuntu |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
>From 21083f6b4244725ff35877d4c93e83aec4b0f3f1 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner at canonical.com>
Date: Fri, 10 Sep 2010 14:18:53 -0600
Subject: [PATCH] UBUNTU: [Config] CONFIG_NL80211_TESTMODE=n

We really shouldn't have this enabled. Its a debug only
feature.

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.master/config/config.common.ports  |    2 +-
 debian.master/config/config.common.ubuntu |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index af11353..e99532b 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -2340,7 +2340,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_TFTP=m
 CONFIG_NILFS2_FS=m
 # CONFIG_NIU is not set
-CONFIG_NL80211_TESTMODE=y
+# CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLATTR=y
 CONFIG_NLS=y
 CONFIG_NLS_ASCII=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index efa786f..b5a4405 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2972,7 +2972,7 @@ CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_NILFS2_FS=m
 CONFIG_NIU=m
-CONFIG_NL80211_TESTMODE=y
+# CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLATTR=y
 CONFIG_NLS=y
 CONFIG_NLS_ASCII=m
-- 
1.7.0.4