diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /include/linux/nsproxy.h | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
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; |