[kernel/f17] Linux 3.6.5

[Dave Jones]

commit 5cffc5a007703179ab5b5406a51e05eb238311c8
Author: Dave Jones <davej at redhat.com>
Date:   Wed Oct 31 14:59:39 2012 -0400

    Linux 3.6.5
    
      Merged upstream:
      - iwlwifi-fix-6000-ch-switch.patch
      - mac80211_local_deauth_v3.6.patch
      - mac80211-connect-with-HT20-if-HT40-is-not-permitted.patch

 iwlwifi-fix-6000-ch-switch.patch                   |   94 --------------------
 kernel.spec                                        |   27 ++----
 ...onnect-with-HT20-if-HT40-is-not-permitted.patch |   75 ----------------
 mac80211_local_deauth_v3.6.patch                   |   66 --------------
 sources                                            |    2 +-
 5 files changed, 9 insertions(+), 255 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index d77ff83..0c61583 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,7 +66,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 4
+%define stable_update 5
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -744,17 +744,8 @@ Patch22014: efifb-skip-DMI-checks-if-bootloader-knows.patch
 #rhbz 857324
 Patch22070: net-tcp-bz857324.patch
 
-#rhbz 770484
-Patch22071: iwlwifi-fix-6000-ch-switch.patch
-
 Patch22072: linux-3.6-arm-build-fixup.patch
 
-#rhbz 862168
-Patch22073: mac80211_local_deauth_v3.6.patch
-
-#rhbz 866013
-Patch22074: mac80211-connect-with-HT20-if-HT40-is-not-permitted.patch
-
 #rhbz 867344
 Patch22077: dont-call-cifs_lookup-on-hashed-negative-dentry.patch
 
@@ -1472,15 +1463,6 @@ ApplyPatch efifb-skip-DMI-checks-if-bootloader-knows.patch
 #rhbz 857324
 ApplyPatch net-tcp-bz857324.patch
 
-#rhbz 770484
-ApplyPatch iwlwifi-fix-6000-ch-switch.patch
-
-#rhbz 862168
-ApplyPatch mac80211_local_deauth_v3.6.patch
-
-#rhbz 866013
-ApplyPatch mac80211-connect-with-HT20-if-HT40-is-not-permitted.patch
-
 #rhbz 867344
 ApplyPatch dont-call-cifs_lookup-on-hashed-negative-dentry.patch
 
@@ -2366,6 +2348,13 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Wed Oct 31 2012 Dave Jones <davej at redhat.com> 3.6.5-1
+- Linux 3.6.5
+  Merged upstream:
+  - iwlwifi-fix-6000-ch-switch.patch
+  - mac80211_local_deauth_v3.6.patch
+  - mac80211-connect-with-HT20-if-HT40-is-not-permitted.patch
+
 * Wed Oct 30 2012 Josh Boyer <jwboyer at redhat.com>
 - CVE-2012-4565 net: divide by zero in tcp algorithm illinois (rhbz 871848 871923)
 
diff --git a/sources b/sources
index 965397c..3800ac9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1a1760420eac802c541a20ab51a093d1  linux-3.6.tar.xz
-d7efab4da2682c44662b684026b059f7  patch-3.6.4.xz
+6ad8ceebb9b5c1bf69a0c07ef7cc81f2  patch-3.6.5.xz