X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=9b2bd093da600bb3d51cea0e47bba22518731a86;hb=refs%2Fheads%2Flibertas;hp=2cec4c6d3ed5d4916f988198de9eb5e143f6fb3d;hpb=ea2b965c2bdd50615640e16edd39f5b154077380;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 2cec4c6d3..9b2bd093d 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -24,7 +24,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 11
+%define taglevel 12
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -159,6 +159,9 @@ Patch210: linux-2.6-210-vserver-cpu-sched.patch
 # IP sets
 Patch250: linux-2.6-250-ipsets.patch
 
+# Support for libertas olpc driver
+Patch300: linux-2.6-300-olpc.patch
+
 # PlanetLab
 Patch500: linux-2.6-500-vserver-filesharing.patch
 Patch510: linux-2.6-510-ipod.patch
@@ -360,6 +363,7 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 210
 
 %ApplyPatch 250
+%ApplyPatch 300
 
 %ApplyPatch 500
 %ApplyPatch 510
@@ -844,6 +848,10 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
+* Tue Jul 15 2008 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-22-12
+- * Bugfix in tuntap
+- * Attempt to fix TCP-payload-related problems with tcpdump
+
 * Wed Jul 09 2008 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-22-11
 - * Split up VNET+ module into its component patches
 - * Added tun/tap support