[kernel] Linux 3.3-rc1-git2 (upstream f8275f9694b8adf9f3498e747ea4c3e8b984499b)

[Josh Boyer]

commit 64d09e6b046b02d725ba859b728c6f22c4a08dee
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Wed Jan 25 11:57:01 2012 -0500

    Linux 3.3-rc1-git2 (upstream f8275f9694b8adf9f3498e747ea4c3e8b984499b)

 bcma-brcmsmac-compat.patch                        |   36 -----
 config-generic                                    |    1 +
 kernel.spec                                       |   15 +--
 mac80211-fix-work-removal-on-deauth-request.patch |  154 ---------------------
 sources                                           |    2 +-
 5 files changed, 6 insertions(+), 202 deletions(-)
---
diff --git a/config-generic b/config-generic
index 8b8fd36..f9a8ee4 100644
--- a/config-generic
+++ b/config-generic
@@ -1463,6 +1463,7 @@ CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
 CONFIG_B43_BCMA=y
+CONFIG_B43_BCMA_EXTRA=y
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_DEBUG=y
 CONFIG_B43_PHY_LP=y
diff --git a/kernel.spec b/kernel.spec
index e9e100f..ce5061d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -736,12 +736,8 @@ Patch21070: ext4-Support-check-none-nocheck-mount-options.patch
 Patch21073: KVM-x86-extend-struct-x86_emulate_ops-with-get_cpuid.patch
 Patch21074: KVM-x86-fix-missing-checks-in-syscall-emulation.patch
 
-Patch21090: bcma-brcmsmac-compat.patch
-
 Patch21091: kmemleak.patch
 
-Patch21092: mac80211-fix-work-removal-on-deauth-request.patch
-
 # compat-wireless patches
 Patch50000: compat-wireless-config-fixups.patch
 Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch
@@ -1423,11 +1419,6 @@ ApplyPatch efi-dont-map-boot-services-on-32bit.patch
 # utrace.
 # pplyPatch utrace.patch
 
-%if !%{with_backports}
-# Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
-ApplyPatch bcma-brcmsmac-compat.patch
-%endif
-
 ApplyPatch ext4-Support-check-none-nocheck-mount-options.patch
 
 #rhbz 773392
@@ -1435,7 +1426,6 @@ ApplyPatch KVM-x86-extend-struct-x86_emulate_ops-with-get_cpuid.patch
 ApplyPatch KVM-x86-fix-missing-checks-in-syscall-emulation.patch
 
 ApplyPatch kmemleak.patch
-ApplyPatch mac80211-fix-work-removal-on-deauth-request.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -2276,6 +2266,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed Jan 25 2012 Josh Boyer <jwboyer at redhat.com> - 3.3.0-0.rc1.git2.1
+- Linux 3.3-rc1-git2 (upstream f8275f9694b8adf9f3498e747ea4c3e8b984499b)
+
 * Tue Jan 24 2012 Josh Boyer <jwboyer at redhat.com>
 - Re-enable the ARCMSR module (rhbz 784287)
 - Re-enable the LIRC_STAGING drivers (rhbz 784398)
diff --git a/sources b/sources
index efd2b1d..3814da3 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 364066fa18767ec0ae5f4e4abcf9dc51  linux-3.2.tar.xz
 2fed18362598429cc0669c01123290ff  compat-wireless-2012-01-09.tar.bz2
 1c3dd34fa219420a4cbed1e573d253e7  patch-3.3-rc1.xz
-a39992f85a392f3a3a515355ad68f889  patch-3.3-rc1-git1.xz
+6eb5ed992fdaf6a22f788531ed4f4683  patch-3.3-rc1-git2.xz