[kernel/f13/master] Revert "hostap_cs-fix-sleeping-function-called-from-invalid-context.patch"

[Kyle McMartin]

commit 365577d418e3d75744be216da5b1d44e4991e769
Author: Kyle McMartin <kyle at redhat.com>
Date:   Mon Jan 31 12:29:46 2011 -0500

    Revert "hostap_cs-fix-sleeping-function-called-from-invalid-context.patch"
    
    ... Apparently I already sucked it in. Doh.
    
    This reverts commit 7c8aa2a2c471ddacefcf52b278e05d6549927e96.

 ...ping-function-called-from-invalid-context.patch |   32 +++++++++++++++-----
 kernel.spec                                        |    9 -----
 2 files changed, 24 insertions(+), 17 deletions(-)
---
diff --git a/hostap_cs-fix-sleeping-function-called-from-invalid-context.patch b/hostap_cs-fix-sleeping-function-called-from-invalid-context.patch
index 62bc823..5ad1365 100644
--- a/hostap_cs-fix-sleeping-function-called-from-invalid-context.patch
+++ b/hostap_cs-fix-sleeping-function-called-from-invalid-context.patch
@@ -1,10 +1,31 @@
-From kernel-bounces at lists.fedoraproject.org Mon Jan 17 08:04:38 2011
+From sgruszka at redhat.com Mon Jan 17 08:04:28 2011
+Return-Path: sgruszka at redhat.com
+Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
+ zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
+ mail03.corp.redhat.com with LMTP; Mon, 17 Jan 2011 08:04:28 -0500 (EST)
+Received: from localhost (localhost.localdomain [127.0.0.1])
+	by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 5CF754C96B;
+	Mon, 17 Jan 2011 08:04:28 -0500 (EST)
+Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+	by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id qCtjRMUf-IeX; Mon, 17 Jan 2011 08:04:28 -0500 (EST)
+Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
+	by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 4B8794C91D;
+	Mon, 17 Jan 2011 08:04:28 -0500 (EST)
+Received: from localhost (vpn-235-108.phx2.redhat.com [10.3.235.108])
+	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p0HD4RC9017134;
+	Mon, 17 Jan 2011 08:04:27 -0500
 From: Stanislaw Gruszka <sgruszka at redhat.com>
 To: stable at kernel.org, kernel at lists.fedoraproject.org
-Subject: [PATCH 2.6.34.y] hostap_cs: fix sleeping function called from invalid
-	context
+Cc: Kyle McMartin <kmcmartin at redhat.com>,
+        Stanislaw Gruszka <sgruszka at redhat.com>,
+        Dominik Brodowski <linux at dominikbrodowski.net>,
+        Tim Gardner <tim.gardner at canonical.com>,
+        linux-wireless at vger.kernel.org
+Subject: [PATCH 2.6.34.y] hostap_cs: fix sleeping function called from invalid context
 Date: Mon, 17 Jan 2011 14:04:25 +0100
 Message-Id: <1295269465-4903-1-git-send-email-sgruszka at redhat.com>
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
 
 commit 4e5518ca53be29c1ec3c00089c97bef36bfed515 upstream.
 
@@ -78,8 +99,3 @@ index f33e18e..116b5c6 100644
 -- 
 1.7.1
 
-_______________________________________________
-kernel mailing list
-kernel at lists.fedoraproject.org
-https://admin.fedoraproject.org/mailman/listinfo/kernel
-
diff --git a/kernel.spec b/kernel.spec
index 7865d41..29b4ed1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -943,9 +943,6 @@ Patch13945: tcp-protect-sysctl_tcp_cookie_size-reads.patch
 # rhbz#673207 (f14)
 Patch13950: sunrpc-kernel-panic-when-mount-nfsv4.patch
 
-# rhbz#643758
-Patch13952: hostap_cs-fix-sleeping-function-called-from-invalid-context.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1812,8 +1809,6 @@ ApplyPatch tcp-protect-sysctl_tcp_cookie_size-reads.patch
 # rhbz#673207 (f14)
 ApplyPatch sunrpc-kernel-panic-when-mount-nfsv4.patch
 
-ApplyPatch hostap_cs-fix-sleeping-function-called-from-invalid-context.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2435,10 +2430,6 @@ fi
 
 
 %changelog
-* Mon Jan 31 2011 Kyle McMartin <kmcmartin at redhat.com>
-- hostap_cs: fix sleeping function called from invalid context (#643758)
-  patch from Stanislaw Gruszka.
-
 * Sun Jan 30 2011 Chuck Ebbert <cebbert at redhat.com>
 - Copy sunrpc oops fix from F14