diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /include/linux/nsproxy.h | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
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 |