rpms/kernel/devel kernel-2.6.spec, 1.2238, 1.2239 linux-2.6-cfq-fix.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11361

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-cfq-fix.patch 
Log Message:
merged upstream



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2238
retrieving revision 1.2239
diff -u -r1.2238 -r1.2239
--- kernel-2.6.spec	31 May 2006 16:35:37 -0000	1.2238
+++ kernel-2.6.spec	31 May 2006 20:12:08 -0000	1.2239
@@ -360,7 +360,6 @@
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1630: linux-2.6-radeon-backlight.patch
 Patch1640: linux-2.6-ide-tune-locking.patch
-Patch1650: linux-2.6-cfq-fix.patch
 Patch1660: linux-2.6-valid-ether-addr.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1680: linux-2.6-autofs4-revalidate-return-fail.patch
@@ -994,8 +993,6 @@
 %patch1630 -p1
 # Fix IDE locking bug.
 %patch1640 -p1
-# Fix CFQ locking bug.
-%patch1650 -p1
 #
 %patch1660 -p1
 # Use persistent allocation in softcursor


--- linux-2.6-cfq-fix.patch DELETED ---