rpms/kernel/devel kernel.spec, 1.2046, 1.2047 linux-2.6-mac80211-age-scan-results-on-resume.patch, 1.1, NONE

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14950

Modified Files:
	kernel.spec 
Removed Files:
	linux-2.6-mac80211-age-scan-results-on-resume.patch 
Log Message:
nuke upstream patch


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2046
retrieving revision 1.2047
diff -u -p -r1.2046 -r1.2047
--- kernel.spec	28 Jun 2010 17:08:40 -0000	1.2046
+++ kernel.spec	28 Jun 2010 17:17:41 -0000	1.2047
@@ -646,8 +646,6 @@ Patch580: linux-2.6-sparc-selinux-mprote
 
 Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
 
-Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
-
 Patch800: linux-2.6-crash-driver.patch
 
 # crypto/
@@ -1221,9 +1219,6 @@ ApplyPatch linux-2.6-silence-fbcon-logo.
 # Changes to upstream defaults.
 
 
-# back-port scan result aging patches
-#ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
-
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
 


--- linux-2.6-mac80211-age-scan-results-on-resume.patch DELETED ---