[kernel] Linux 3.2-rc1-git1 (upstream 19e0bafc36a)

[Josh Boyer]

commit 33f57de72af0d5753c8e5833eba636c16ed2b306
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Wed Nov 9 07:44:03 2011 -0500

    Linux 3.2-rc1-git1 (upstream 19e0bafc36a)
    
    Enable the brcm80211 modules now that they have left staging

 config-generic |    5 +++--
 kernel.spec    |    8 ++++++--
 sources        |    1 +
 3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/config-generic b/config-generic
index a668c78..dfccf0c 100644
--- a/config-generic
+++ b/config-generic
@@ -1569,6 +1569,9 @@ CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 # CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+# CONFIG_BRCMDBG is not set
 CONFIG_HERMES=m
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
 # CONFIG_HERMES_PRISM is not set
@@ -4488,8 +4491,6 @@ CONFIG_USB_ATMEL=m
 CONFIG_ALTERA_STAPL=m
 # CONFIG_DVB_CXD2099 is not set
 # CONFIG_USBIP_CORE is not set
-# CONFIG_BRCMSMAC is not set
-# CONFIG_BRCMFMAC is not set
 # CONFIG_INTEL_MEI is not set
 # CONFIG_ZCACHE is not set
 # CONFIG_RTS5139 is not set
diff --git a/kernel.spec b/kernel.spec
index 4366722..ad7eaaa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 2
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -87,7 +87,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -2046,6 +2046,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed Nov 09 2011 Josh Boyer <jwboyer at redhat.com>
+- Linux 3.2-rc1-git1
+- Enable the brcm80211 modules now that they have left staging
+
 * Tue Nov 08 2011 Josh Boyer <jwboyer at redhat.com>
 - Add python-perf-debuginfo package (rhbz 752140)
 
diff --git a/sources b/sources
index d4a3b93..9258f0a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 8d43453f8159b2332ad410b19d86a931  linux-3.1.tar.bz2
 c12c4ef15682ca8caa360d013625ea3f  patch-3.2-rc1.bz2
+40372c1a7aa9f98e2ee0df1944e826b1  patch-3.2-rc1-git1.bz2