version number bumped to 1.2.2, pending-patches updated

diff --git a/Makefile b/Makefile
index b7ca0212095e7f843d920c46138529650e0b5b5a..060d6f008e813f8ab7290b0dea4646559531b17f 100644 (file)
--- 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