From patchwork Wed Dec  9 15:55:54 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Hardy LP#487010 pull request
Date: Wed, 09 Dec 2009 05:55:54 -0000
From: Tim Gardner <tim.gardner@canonical.com>
X-Patchwork-Id: 40727
Message-Id: <4B1FC88A.9090200@canonical.com>
To: Stefan Bader <stefan.bader@canonical.com>
Cc: Kernel team list <kernel-team@lists.ubuntu.com>

Please pull from git://kernel.ubuntu.com/rtg/ubuntu-hardy lp487010

rtg


diff --git a/debian/config/i386/config b/debian/config/i386/config
index 67b29b2..e697e4d 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -823,6 +823,7 @@ CONFIG_NF_CONNTRACK_ENABLED=m
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_PPTP=m
diff --git a/debian/config/i386/config.386 b/debian/config/i386/config.386
index b6161a4..c3aed6f 100644
--- a/debian/config/i386/config.386
+++ b/debian/config/i386/config.386
@@ -1110,7 +1110,6 @@ CONFIG_NEW_LEDS=y
 CONFIG_NFTL=m
 CONFIG_NFTL_RW=y
 CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CT_PROTO_SCTP=m
diff --git a/debian/config/i386/config.generic b/debian/config/i386/config.generic
index ccae931..f57c52a 100644
--- a/debian/config/i386/config.generic
+++ b/debian/config/i386/config.generic
@@ -1107,7 +1107,6 @@ CONFIG_NEW_LEDS=y
 CONFIG_NFTL=m
 CONFIG_NFTL_RW=y
 CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CT_PROTO_SCTP=m
diff --git a/debian/config/i386/config.server b/debian/config/i386/config.server
index 24f3132..a002dac 100644
--- a/debian/config/i386/config.server
+++ b/debian/config/i386/config.server
@@ -1108,7 +1108,6 @@ CONFIG_NEW_LEDS=y
 CONFIG_NFTL=m
 CONFIG_NFTL_RW=y
 CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CT_PROTO_SCTP=m
diff --git a/debian/config/i386/config.virtual b/debian/config/i386/config.virtual
index 17ac914..4f7e2c6 100644
--- a/debian/config/i386/config.virtual
+++ b/debian/config/i386/config.virtual
@@ -290,7 +290,6 @@ CONFIG_NET_CLS_POLICE=y
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IPV6 is not set
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
 # CONFIG_NF_CT_PROTO_SCTP is not set