rpms/kernel/FC-4 kernel-2.6.spec,1.1386,1.1387 upstream,1.78,1.79

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec upstream 
Log Message:
2.6.12.2



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1386
retrieving revision 1.1387
diff -u -r1.1386 -r1.1387
--- kernel-2.6.spec	28 Jun 2005 16:52:48 -0000	1.1386
+++ kernel-2.6.spec	1 Jul 2005 16:29:24 -0000	1.1387
@@ -213,7 +213,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.12.1.bz2
+Patch1: patch-2.6.12.2.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1253,6 +1253,9 @@
 %endif
 
 %changelog
+* Wed Jun 29 2005 Dave Jones <davej at redhat.com>
+- 2.6.12.2
+
 * Mon Jun 27 2005 Dave Jones <davej at redhat.com>
 - Disable multipath caches. (#161168)
 - Reenable AMD756 I2C driver for x86-64. (#159609)


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- upstream	22 Jun 2005 23:19:31 -0000	1.78
+++ upstream	1 Jul 2005 16:29:24 -0000	1.79
@@ -1,3 +1,3 @@
 linux-2.6.12.tar.bz2
-patch-2.6.12.1.bz2
+patch-2.6.12.2.bz2