rpms/kernel/devel kernel.spec,1.1379,1.1380

[Kristian Høgsberg]

Author: krh

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31407

Modified Files:
	kernel.spec 
Log Message:
* Wed Mar  4 2009  <krh at redhat.com>
- Add fix for deadlock in drm setmaster.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1379
retrieving revision 1.1380
diff -u -r1.1379 -r1.1380
--- kernel.spec	4 Mar 2009 15:34:03 -0000	1.1379
+++ kernel.spec	4 Mar 2009 17:55:48 -0000	1.1380
@@ -649,9 +649,9 @@
 Patch1812: drm-modesetting-radeon.patch
 Patch1813: drm-radeon-pm.patch
 Patch1814: drm-nouveau.patch
-#Patch1815: drm-intel-next.patch
 Patch1816: drm-no-gem-on-i8xx.patch
 Patch1818: drm-i915-resume-force-mode.patch
+Patch1819: drm-fix-setmaster-deadlock.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1183,9 +1183,9 @@
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
 #ApplyPatch drm-radeon-pm.patch
-#ApplyPatch drm-intel-next.patch
 ApplyPatch drm-no-gem-on-i8xx.patch
 ApplyPatch drm-i915-resume-force-mode.patch
+ApplyPatch drm-fix-setmaster-deadlock.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1792,6 +1792,9 @@
 # and build.
 
 %changelog
+* Wed Mar  4 2009  <krh at redhat.com>
+- Add fix for deadlock in drm setmaster.
+
 * Wed Mar 04 2009 Kyle McMartin <kyle at redhat.com>
 - Rebase git-bluetooth.patch from bluetooth-next-2.6 instead of
   bluetooth-testing, per Marcel's suggestions.