diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
| commit | 353816f43d1fb340ff2d9a911dd5d0799c09f6a5 (patch) | |
| tree | 517290fd884d286fe2971137ac89f89e3567785a /include/linux/nsproxy.h | |
| parent | 160bbab3000dafccbe43688e48208cecf4deb879 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'include/linux/nsproxy.h')
| -rw-r--r-- | include/linux/nsproxy.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h index c8a768e59640..afad7dec1b36 100644 --- a/include/linux/nsproxy.h +++ b/include/linux/nsproxy.h | |||
| @@ -27,7 +27,6 @@ struct nsproxy { | |||
| 27 | struct ipc_namespace *ipc_ns; | 27 | struct ipc_namespace *ipc_ns; |
| 28 | struct mnt_namespace *mnt_ns; | 28 | struct mnt_namespace *mnt_ns; |
| 29 | struct pid_namespace *pid_ns; | 29 | struct pid_namespace *pid_ns; |
| 30 | struct user_namespace *user_ns; | ||
| 31 | struct net *net_ns; | 30 | struct net *net_ns; |
| 32 | }; | 31 | }; |
| 33 | extern struct nsproxy init_nsproxy; | 32 | extern struct nsproxy init_nsproxy; |