X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=6fbdb1e0999c8c2d224ee656d054043b651e5855;hb=5e5807c754a6170c8465253f0b965deb8e91d061;hp=ea637223c24254b9973bba60a728b42078be6a5f;hpb=83c59abfe5025e0fe619476440220ffdf75aabcc;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index ea637223c..6fbdb1e09 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -25,7 +25,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 # for module-tag.py - sublevel is used for the version (middle) part of tag names
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 39
+%define taglevel 40
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -188,7 +188,7 @@ Patch660: linux-2.6-660-nmi-watchdog-default.patch
 Patch670: linux-2.6-670-gcc43.patch
 %endif
 Patch680: linux-2.6-680-htb-hysteresis-tso.patch
-Patch690: linux-2.6-690-web100.patch
+#Patch690: linux-2.6-690-web100.patch
 Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch
 Patch730: linux-2.6-730-igb-driver.patch
 
@@ -408,7 +408,6 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 670
 %endif
 %ApplyPatch 680
-%ApplyPatch 690
 %ApplyPatch 710
 %ApplyPatch 730
 
@@ -891,6 +890,9 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
+* Sun Nov  8 2009 Daniel Hokka Zakrisson <daniel@hozac.com> linux-2.6-22-40.coblitz
+- Tag CoBlitz kernel
+
 * Tue May 26 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-39
 - outputs the kernel-headers rpm as backported from 2.6.27