From 9b6526e276e391dfc5103e1c662e4db152338733 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 26 May 2011 16:40:37 -0400
Subject: [PATCH] --- yaml --- r: 252281 b: refs/heads/master c:
 bee95250f015ffc3a6efb99516489e70d1b52da2 h: refs/heads/master i:   252279:
 7dd879a8b325680f1fb314101fba92eda65fabd6 v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/netfilter.h   | 1 +
 trunk/include/net/net_namespace.h | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0d90478d6a00..6a8c46ca4d66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d931dd2ed62c14d7bf7c4c3ab3ef7610c46ca9b
+refs/heads/master: bee95250f015ffc3a6efb99516489e70d1b52da2
diff --git a/trunk/include/linux/netfilter.h b/trunk/include/linux/netfilter.h
index 7fa95df60146..857f5026ced6 100644
--- a/trunk/include/linux/netfilter.h
+++ b/trunk/include/linux/netfilter.h
@@ -13,6 +13,7 @@
 #endif
 #include <linux/types.h>
 #include <linux/compiler.h>
+#include <linux/sysctl.h>
 
 /* Responses from hook functions. */
 #define NF_DROP 0
diff --git a/trunk/include/net/net_namespace.h b/trunk/include/net/net_namespace.h
index 3ae491932bc8..07a60e8b749e 100644
--- a/trunk/include/net/net_namespace.h
+++ b/trunk/include/net/net_namespace.h
@@ -7,6 +7,7 @@
 #include <asm/atomic.h>
 #include <linux/workqueue.h>
 #include <linux/list.h>
+#include <linux/sysctl.h>
 
 #include <net/netns/core.h>
 #include <net/netns/mib.h>