[kernel] Linux v3.8-rc3-293-g406089d

[Justin M. Forbes]

commit 45aa9a25561570fc0feb8d355edaf7f763b4743e
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Tue Jan 15 17:02:15 2013 -0600

    Linux v3.8-rc3-293-g406089d

 arm-omapdrm-fixinc.patch         | 2767 --------------------------------------
 config-generic                   |    2 +
 kernel.spec                      |   17 +-
 mac80211-fix-ibss-scanning.patch |  132 --
 sources                          |    2 +-
 5 files changed, 8 insertions(+), 2912 deletions(-)
---
diff --git a/config-generic b/config-generic
index b5d9641..ca7e7fb 100644
--- a/config-generic
+++ b/config-generic
@@ -1518,6 +1518,8 @@ CONFIG_ATH9K_HTC=m
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 # CONFIG_CARL9170_HWRNG is not set
diff --git a/kernel.spec b/kernel.spec
index 6c479b7..426e8c6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,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
@@ -95,7 +95,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -717,7 +717,6 @@ Patch21001: arm-allnoconfig-error-__LINUX_ARM_ARCH__-undeclared.patch
 # OMAP
 # https://patchwork.kernel.org/patch/1721241/
 # https://patchwork.kernel.org/patch/1839401/
-Patch21003: arm-omapdrm-fixinc.patch
 
 # ARM tegra
 Patch21004: arm-tegra-nvec-kconfig.patch
@@ -737,10 +736,6 @@ Patch22070: irqnr-build.patch
 #rhbz 859485
 Patch21226: vt-Drop-K_OFF-for-VC_MUTE.patch
 
-#rhbz 883414
-Patch21236: mac80211-fix-ibss-scanning.patch
-
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1301,7 +1296,6 @@ ApplyPatch vmbugon-warnon.patch
 #
 ApplyPatch arm-export-read_current_timer.patch
 ApplyPatch arm-allnoconfig-error-__LINUX_ARM_ARCH__-undeclared.patch
-ApplyPatch arm-omapdrm-fixinc.patch
 # ApplyPatch arm-tegra-nvec-kconfig.patch
 ApplyPatch arm-tegra-usb-no-reset-linux33.patch
 
@@ -1424,10 +1418,6 @@ ApplyPatch irqnr-build.patch
 #rhbz 859485
 ApplyPatch vt-Drop-K_OFF-for-VC_MUTE.patch
 
-#rhbz 883414
-ApplyPatch mac80211-fix-ibss-scanning.patch
-
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2296,6 +2286,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Jan 15 2013 Justin M. Forbes <jforbes at redhat.com> - 3.8.0-0.rc3.git2.1
+- Linux v3.8-rc3-293-g406089d
+
 * Tue Jan 15 2013 Josh Boyer <jwboyer at redhat.com>
 - Enable CONFIG_DVB_USB_V2 (rhbz 895460)
 
diff --git a/sources b/sources
index 779b7d5..626fd25 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 21223369d682bcf44bcdfe1521095983  linux-3.7.tar.xz
 f2b76b61390ce8f3e1303d9a6a645498  patch-3.8-rc3.xz
-394345a07cea1f27afeb74a780597072  patch-3.8-rc3-git1.xz
+fca85aec6adc6f3047d9b32e84560e5f  patch-3.8-rc3-git2.xz