X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=8d192df25865991efead34b596df42bda6c52424;hb=HEAD;hp=7ce068806251687793b305a938dde8ebb0013c54;hpb=c8e309f097ecc7e7c2fe149114508804d29f10bc;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 7ce068806..8d192df25 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -10,7 +10,7 @@ URL: %{SCMURL}
 
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 34
+%define taglevel 36
 
 %define sublevel 32
 
@@ -658,6 +658,7 @@ Source82: config-generic
 Source83: config-x86_64-debug-rhel
 
 Patch0: linux-2.6-001-bcm5720.patch
+Patch20001: linux-2.6-002-divide-by-zero-fix.patch
 Patch1: patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.diff
 Patch2: linux-2.6-255-vserver-delta-cow-fix23.patch
 Patch3: linux-2.6-250-ipsets.patch
@@ -1792,6 +1793,11 @@ fi
 %endif
 
 %changelog
+* Tue Sep 04 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-32-36
+- fix filename in specfile - 2.6-35 was broken
+
+* Wed Aug 29 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-35
+
 * Wed Aug 29 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-34
 
 * Thu May 03 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-33