diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-02 08:17:13 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-02 08:17:13 -0500 |
| commit | b21a207141d83a06abc5f492b80204602e02ca44 (patch) | |
| tree | f0152cde543008c72d7eb5c12c18095ad92785e6 /include/linux/nsproxy.h | |
| parent | 3af373021fa32f8f787bfbdcc1a9277a287bde4e (diff) | |
| parent | b58602a4bac012b5f4fc12fe6b46ab237b610d5d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Conflicts:
drivers/uwb/wlp/eda.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; |