summaryrefslogtreecommitdiffstats
path: root/kernel/nsproxy.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-10 08:35:40 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-10 08:35:40 +0200
commit429b022af41108f6942d72547592b1d30e9a51f0 (patch)
tree7d68355529718018cdad1241285816c6f64620b2 /kernel/nsproxy.c
parent0cd418ddb1ee88df7d16d5df06cb2da68eceb9e4 (diff)
parentadee14b2e1557d0a8559f29681732d05a89dfc35 (diff)
downloadkernel-crypto-429b022af41108f6942d72547592b1d30e9a51f0.tar.gz
kernel-crypto-429b022af41108f6942d72547592b1d30e9a51f0.tar.xz
kernel-crypto-429b022af41108f6942d72547592b1d30e9a51f0.zip
Merge commit 'v2.6.27-rc6' into core/rcu
Diffstat (limited to 'kernel/nsproxy.c')
-rw-r--r--kernel/nsproxy.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 21575fc46d0..1d3ef29a258 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -14,7 +14,6 @@
*/
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/nsproxy.h>
#include <linux/init_task.h>
#include <linux/mnt_namespace.h>