diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 14:39:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 14:39:12 +0200 |
| commit | f58899bb0224741eb0409ada67ecafe90ba137ef (patch) | |
| tree | 78284f77021e830b32e77071dd2ef4e5ccdaa289 /kernel/nsproxy.c | |
| parent | x86: fix HPET regression in 2.6.26 versus 2.6.25, check hpet against BAR, v3 (diff) | |
| parent | Fix oops in acer_wmi driver (acer_wmi_init) (diff) | |
| download | linux-f58899bb0224741eb0409ada67ecafe90ba137ef.tar.gz linux-f58899bb0224741eb0409ada67ecafe90ba137ef.zip | |
Merge branch 'linus' into x86/urgent
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 21575fc46d05..1d3ef29a2583 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> |