diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /include/linux/nfs_fs_i.h | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/nfs_fs_i.h')
| -rw-r--r-- | include/linux/nfs_fs_i.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/nfs_fs_i.h b/include/linux/nfs_fs_i.h index 861730275ba0..a5c50d97341e 100644 --- a/include/linux/nfs_fs_i.h +++ b/include/linux/nfs_fs_i.h | |||
| @@ -1,10 +1,6 @@ | |||
| 1 | #ifndef _NFS_FS_I | 1 | #ifndef _NFS_FS_I |
| 2 | #define _NFS_FS_I | 2 | #define _NFS_FS_I |
| 3 | 3 | ||
| 4 | #include <asm/types.h> | ||
| 5 | #include <linux/list.h> | ||
| 6 | #include <linux/nfs.h> | ||
| 7 | |||
| 8 | struct nlm_lockowner; | 4 | struct nlm_lockowner; |
| 9 | 5 | ||
| 10 | /* | 6 | /* |