rpms/kernel/F-13 kernel.spec,1.2091,1.2092

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22866

Modified Files:
	kernel.spec 
Log Message:
iwlwifi: cancel scan watchdog in iwl_bg_abort_scan (#590436)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2091
retrieving revision 1.2092
diff -u -p -r1.2091 -r1.2092
--- kernel.spec	9 Jul 2010 13:49:28 -0000	1.2091
+++ kernel.spec	9 Jul 2010 14:45:58 -0000	1.2092
@@ -749,6 +749,9 @@ Patch12041: mac80211-do-not-wipe-out-old
 Patch12042: mac80211-explicitly-disable-enable-QoS.patch
 Patch12043: mac80211-fix-supported-rates-IE-if-AP-doesnt-give-us-its-rates.patch
 
+# iwlwifi: cancel scan watchdog in iwl_bg_abort_scan
+Patch12050: iwlwifi-cancel-scan-watchdog-in-iwl_bg_abort_scan.patch
+
 Patch12100: ata-generic-handle-new-mbp-with-mcp89.patch
 Patch12110: ata-generic-implement-ata-gen-flags.patch
 
@@ -1374,6 +1377,9 @@ ApplyPatch iwlwifi-manage-QoS-by-mac-sta
 ApplyPatch mac80211-do-not-wipe-out-old-supported-rates.patch
 ApplyPatch mac80211-fix-supported-rates-IE-if-AP-doesnt-give-us-its-rates.patch
 
+# iwlwifi: cancel scan watchdog in iwl_bg_abort_scan
+ApplyPatch iwlwifi-cancel-scan-watchdog-in-iwl_bg_abort_scan.patch
+
 ApplyPatch quiet-prove_RCU-in-cgroups.patch
 
 # BZ#608034
@@ -2011,6 +2017,9 @@ fi
 
 
 %changelog
+* Fri Jul 09 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.1-8
+- iwlwifi: cancel scan watchdog in iwl_bg_abort_scan (#590436)
+
 * Fri Jul 09 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.1-7
 - Restore PowerPC VIO modalias patch; use the upstream version.
 - Drop Mac G5 thermal shutdown patch, now upstream.