diff --git a/[refs] b/[refs]
index be62f83ca15b..4730e90a132f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4f2c8819a51f31ef0f929574ce8d80b323c6a76
+refs/heads/master: 0ba857ad671aa8aa2a1276aa7a0c79abd0575146
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 946cd5320ef9..b63bdf899a75 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -2322,10 +2322,6 @@ int __init regulatory_init(void)
 		 * errors as non-fatal.
 		 */
 		pr_err("kobject_uevent_env() was unable to call CRDA during init\n");
-#ifdef CONFIG_CFG80211_REG_DEBUG
-		/* We want to find out exactly why when debugging */
-		WARN_ON(err);
-#endif
 	}
 
 	/*