diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 15:31:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 15:31:03 +0200 |
| commit | 77dd3b3bd23111040c504be6bd873a5ad09f02df (patch) | |
| tree | 119ddcdf89d6a593a8fefea530249084559eeb44 /kernel/user_namespace.c | |
| parent | 916c7a855174e3b53d182b97a26b2e27a29726a1 (diff) | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
| download | talos-obmc-linux-77dd3b3bd23111040c504be6bd873a5ad09f02df.tar.gz talos-obmc-linux-77dd3b3bd23111040c504be6bd873a5ad09f02df.zip | |
Merge branch 'linus' into timers/ntp
Diffstat (limited to 'kernel/user_namespace.c')
| -rw-r--r-- | kernel/user_namespace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index a9ab0596de44..532858fa5b88 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -6,7 +6,6 @@ */ #include <linux/module.h> -#include <linux/version.h> #include <linux/nsproxy.h> #include <linux/slab.h> #include <linux/user_namespace.h> |
