diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /include/linux/nsproxy.h | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'include/linux/nsproxy.h')
| -rw-r--r-- | include/linux/nsproxy.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h index afad7dec1b36..7b370c7cfeff 100644 --- a/include/linux/nsproxy.h +++ b/include/linux/nsproxy.h | |||
| @@ -8,6 +8,7 @@ struct mnt_namespace; | |||
| 8 | struct uts_namespace; | 8 | struct uts_namespace; |
| 9 | struct ipc_namespace; | 9 | struct ipc_namespace; |
| 10 | struct pid_namespace; | 10 | struct pid_namespace; |
| 11 | struct fs_struct; | ||
| 11 | 12 | ||
| 12 | /* | 13 | /* |
| 13 | * A structure to contain pointers to all per-process | 14 | * A structure to contain pointers to all per-process |