rpms/kernel/devel kernel-2.6.spec,1.3050,1.3051

[fedora-cvs-commits at redhat.com]

Author: krh

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

Modified Files:
	kernel-2.6.spec 
Log Message:
* Fri Apr  6 2007 Kristian Høgsberg <krh at redhat.com>
- Add patches to fix #235463 and possibly #235199 and #231708.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3050
retrieving revision 1.3051
diff -u -r1.3050 -r1.3051
--- kernel-2.6.spec	5 Apr 2007 22:21:27 -0000	1.3050
+++ kernel-2.6.spec	6 Apr 2007 15:24:41 -0000	1.3051
@@ -565,6 +565,11 @@
 # a0ab4547b23c09541bc47a294a1397b3b0415bfe in the linux1394 git tree.
 Patch5000: linux-2.6-firewire.patch
 
+# These two are going upstream and will get folded into patch 5000,
+# this is just to get some testing ASAP.
+Patch5001: linux-2.6-firewire-context-run.patch
+Patch5002: linux-2.6-firewire-check-condition.patch
+ 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
 # amount of drivers they touch. But only these should go here.
@@ -1265,6 +1270,8 @@
 
 # Pull in the new firewire stack
 %patch5000 -p1
+%patch5001 -p1
+%patch5002 -p1
 
 #
 # final stuff
@@ -2242,6 +2249,9 @@
 #  - tux.
 
 %changelog
+* Fri Apr  6 2007 Kristian Høgsberg <krh at redhat.com>
+- Add patches to fix #235463 and possibly #235199 and #231708.
+
 * Thu Apr 05 2007 Dave Jones <davej at redhat.com>
 - Fix kernel.org bugzilla #8301: spinlock fix for flexcop-pci (#234900)