diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 10:54:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 10:54:07 +0200 |
| commit | e4f807c2b4d81636fc63993368646c5bfd42b22f (patch) | |
| tree | 2ff100911b1ba4e26e3d9aad41edb9b48405f01e /kernel/nsproxy.c | |
| parent | 25258ef762bc4a05fa9c4523f7dae56e3fd01864 (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/paravirt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/nsproxy.c')
| -rw-r--r-- | kernel/nsproxy.c | 1 |
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> |