diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-03 10:35:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-03 10:35:09 -0400 |
| commit | 484cad34dd667235565c14a40e2f5a8143184aaa (patch) | |
| tree | 70bb901671958960a64d7f383c902178b4b49558 /include/linux/nsproxy.h | |
| parent | 95a38f34635bdf06089de763b4becbc957694977 (diff) | |
| parent | 67796bf7dc54c035fd97f2681a72e5d2bf2a234a (diff) | |
Merge branch 'dma-debug' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
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 |