From fb1de67c9d196c80bb64d3697225dfe5f653e24b Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 21 May 2008 14:08:38 -0700
Subject: [PATCH] --- yaml --- r: 97183 b: refs/heads/master c:
 c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7 h: refs/heads/master i:   97181:
 af39fba4d37c8a4352b9964ee8f1c8345f217873   97179:
 ad1b5f42dbbc8b95fd71a96d45248d7b861954e0   97175:
 5384929943acfe82f938be7a7f4233e0e5c47da1   97167:
 3c16b06ccf017a5e9fd337407bfc5e22573cc901   97151:
 f17641dc542ebf16172b450103bed44fea885bbc v: v3

---
 [refs]                                          | 2 +-
 trunk/include/linux/netfilter.h                 | 2 +-
 trunk/include/linux/netfilter_arp/arp_tables.h  | 2 +-
 trunk/include/linux/netfilter_ipv4/ip_tables.h  | 2 +-
 trunk/include/linux/netfilter_ipv6/ip6_tables.h | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fd4281da8240..fd1238731a1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4da5105687e0993a3bbdcffd89b2b94d9377faab
+refs/heads/master: c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7
diff --git a/trunk/include/linux/netfilter.h b/trunk/include/linux/netfilter.h
index e4c66593b5c6..0c5eb7ed8b3f 100644
--- a/trunk/include/linux/netfilter.h
+++ b/trunk/include/linux/netfilter.h
@@ -3,7 +3,6 @@
 
 #ifdef __KERNEL__
 #include <linux/init.h>
-#include <linux/types.h>
 #include <linux/skbuff.h>
 #include <linux/net.h>
 #include <linux/netdevice.h>
@@ -14,6 +13,7 @@
 #include <linux/list.h>
 #include <net/net_namespace.h>
 #endif
+#include <linux/types.h>
 #include <linux/compiler.h>
 
 /* Responses from hook functions. */
diff --git a/trunk/include/linux/netfilter_arp/arp_tables.h b/trunk/include/linux/netfilter_arp/arp_tables.h
index dd9c97f2d436..590ac3d6d5d6 100644
--- a/trunk/include/linux/netfilter_arp/arp_tables.h
+++ b/trunk/include/linux/netfilter_arp/arp_tables.h
@@ -11,11 +11,11 @@
 
 #ifdef __KERNEL__
 #include <linux/if.h>
-#include <linux/types.h>
 #include <linux/in.h>
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
 #endif
+#include <linux/types.h>
 #include <linux/compiler.h>
 #include <linux/netfilter_arp.h>
 
diff --git a/trunk/include/linux/netfilter_ipv4/ip_tables.h b/trunk/include/linux/netfilter_ipv4/ip_tables.h
index bfc889f90276..092bd50581a9 100644
--- a/trunk/include/linux/netfilter_ipv4/ip_tables.h
+++ b/trunk/include/linux/netfilter_ipv4/ip_tables.h
@@ -17,11 +17,11 @@
 
 #ifdef __KERNEL__
 #include <linux/if.h>
-#include <linux/types.h>
 #include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
 #endif
+#include <linux/types.h>
 #include <linux/compiler.h>
 #include <linux/netfilter_ipv4.h>
 
diff --git a/trunk/include/linux/netfilter_ipv6/ip6_tables.h b/trunk/include/linux/netfilter_ipv6/ip6_tables.h
index f2507dcc5750..1089e33cf633 100644
--- a/trunk/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/trunk/include/linux/netfilter_ipv6/ip6_tables.h
@@ -17,11 +17,11 @@
 
 #ifdef __KERNEL__
 #include <linux/if.h>
-#include <linux/types.h>
 #include <linux/in6.h>
 #include <linux/ipv6.h>
 #include <linux/skbuff.h>
 #endif
+#include <linux/types.h>
 #include <linux/compiler.h>
 #include <linux/netfilter_ipv6.h>