X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=407aaf973e34c35ef5c8a9a8e4157c1d9e8d122c;hb=bda5212425ed821d387ba726f9b8de9042e06cb9;hp=9d48fcb8bc54586c8dc19959199c316ce8fdd60f;hpb=0d434d27217f48c4f6bfe343524364b009e20a2f;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 9d48fcb8b..407aaf973 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -10,15 +10,11 @@ URL: %{SCMURL}
 
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 33
+%define taglevel 34
 
 %define sublevel 32
 
-%if ("%{distro}" == "Fedora" && %{distrorelease} >= 12) || ("%{distro}" == "SL" && %{distrorelease} >= 6) || ("%{distro}" == "CentOS" && %{distrorelease} >= 6)
 %define modern_distro 1
-%else
-%define modern_distro 0
-%endif
 #### Planet-Lab ####
 
 Summary: The Linux kernel
@@ -662,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.diff
 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
@@ -981,6 +978,7 @@ make -f %{SOURCE20} VERSION=%{version} configs
 
 #### Planet-Lab ####
 ApplyPatch linux-2.6-001-bcm5720.patch
+ApplyPatch linux-2.6-002-divide-by-zero-fix.patch
 ApplyPatch patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.diff
 ApplyPatch linux-2.6-255-vserver-delta-cow-fix23.patch
 ApplyPatch linux-2.6-250-ipsets.patch
@@ -1795,6 +1793,8 @@ fi
 %endif
 
 %changelog
+* 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
 - More compiletime fixes.