From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 20 Feb 2006 20:19:09 +0000 (+0000)
Subject: - added ipset support
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~59
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e1d58b188a2301646c5f9c12e6ab1305ca9032b4;p=linux-2.6.git

- added ipset support
- add conntrack classification support
- bump release number
---

diff --git a/Makefile b/Makefile
index 5dffd6c77..0bb714d7a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 12
-EXTRAVERSION = -1.1398_FC4.4.planetlab
+EXTRAVERSION = -1.1398_FC4.5.planetlab
 NAME=Woozy Numbat
 
 # *DOCUMENTATION*
diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec
index aaab73453..c5b911051 100644
--- a/scripts/kernel-2.6-planetlab.spec
+++ b/scripts/kernel-2.6-planetlab.spec
@@ -23,7 +23,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 %define rpmversion 2.6.%{sublevel}
 %define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
 
-%define release 1.1398_FC4.4%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release 1.1398_FC4.5%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 %define signmodules 0
 %define make_target bzImage