From be152ecb0be323dcc2f5ce1d42f8921ebf0d0f8f Mon Sep 17 00:00:00 2001
From: laforge <laforge>
Date: Mon, 30 Apr 2001 04:21:40 +0000
Subject: version number bumped to 1.2.2, pending-patches updated

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b7ca021..060d6f0 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,11 @@ TOPLEVEL_INCLUDED=YES
 ifndef KERNEL_DIR
 KERNEL_DIR=/usr/src/linux
 endif
-NETFILTER_VERSION:=1.2.1a
-OLD_NETFILTER_VERSION:=1.2
+NETFILTER_VERSION:=1.2.2
+OLD_NETFILTER_VERSION:=1.2.1a
 
 # Waiting for inclusions in the kernel tree.
-PENDING_PATCHES:=dropped-table.patch seqoffset.patch irc-conntrack-nat.patch
+PENDING_PATCHES:=ftp-fixes.patch irc-conntrack-nat.patch
 # These went in previous kernels.
 PENDING_PATCHES+=ipv6-fixes.patch.ipv6 masquerade+fwmark.patch nat-overlap.patch ppc-sparc-mangle.patch tos-fix.patch masq-dynaddr.patch
 
-- 
cgit v1.2.3