From f8c98dded4c7bd880b32f2db70cf7f38a77a7790 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Tue, 24 Jul 2007 15:31:05 -0700
Subject: [PATCH] --- yaml --- r: 62789 b: refs/heads/master c:
 85ccc365e91de9f0053c94de4cbc6ce97f8170e7 h: refs/heads/master i:   62787:
 14f4a1d8f66a6a9be018ab55022822e1e1978200 v: v3

---
 [refs]                                           | 2 +-
 trunk/net/netfilter/nf_conntrack_proto_tcp.c     | 1 -
 trunk/net/netfilter/nf_conntrack_proto_udp.c     | 1 -
 trunk/net/netfilter/nf_conntrack_proto_udplite.c | 1 -
 trunk/net/netfilter/xt_physdev.c                 | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 76c92247e5e1..0b3c58a61a18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62c7931873f203ce4ad8f62942b43a1126b37378
+refs/heads/master: 85ccc365e91de9f0053c94de4cbc6ce97f8170e7
diff --git a/trunk/net/netfilter/nf_conntrack_proto_tcp.c b/trunk/net/netfilter/nf_conntrack_proto_tcp.c
index 87ad3ccf8aff..eb3fe7401466 100644
--- a/trunk/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/trunk/net/netfilter/nf_conntrack_proto_tcp.c
@@ -8,7 +8,6 @@
 
 #include <linux/types.h>
 #include <linux/timer.h>
-#include <linux/netfilter.h>
 #include <linux/module.h>
 #include <linux/in.h>
 #include <linux/tcp.h>
diff --git a/trunk/net/netfilter/nf_conntrack_proto_udp.c b/trunk/net/netfilter/nf_conntrack_proto_udp.c
index 13d94a025723..2a2fd1a764ea 100644
--- a/trunk/net/netfilter/nf_conntrack_proto_udp.c
+++ b/trunk/net/netfilter/nf_conntrack_proto_udp.c
@@ -9,7 +9,6 @@
 #include <linux/types.h>
 #include <linux/timer.h>
 #include <linux/module.h>
-#include <linux/netfilter.h>
 #include <linux/udp.h>
 #include <linux/seq_file.h>
 #include <linux/skbuff.h>
diff --git a/trunk/net/netfilter/nf_conntrack_proto_udplite.c b/trunk/net/netfilter/nf_conntrack_proto_udplite.c
index 93e747b5396e..b906b413997c 100644
--- a/trunk/net/netfilter/nf_conntrack_proto_udplite.c
+++ b/trunk/net/netfilter/nf_conntrack_proto_udplite.c
@@ -10,7 +10,6 @@
 #include <linux/types.h>
 #include <linux/timer.h>
 #include <linux/module.h>
-#include <linux/netfilter.h>
 #include <linux/udp.h>
 #include <linux/seq_file.h>
 #include <linux/skbuff.h>
diff --git a/trunk/net/netfilter/xt_physdev.c b/trunk/net/netfilter/xt_physdev.c
index f47cab7a696d..a4bab043a6d1 100644
--- a/trunk/net/netfilter/xt_physdev.c
+++ b/trunk/net/netfilter/xt_physdev.c
@@ -13,7 +13,6 @@
 #include <linux/netfilter_bridge.h>
 #include <linux/netfilter/xt_physdev.h>
 #include <linux/netfilter/x_tables.h>
-#include <linux/netfilter_bridge.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Bart De Schuymer <bdschuym@pandora.be>");