diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-07-16 00:21:39 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-07-16 00:21:39 -0400 |
| commit | f6c43385435640e056424034caac0d765c45e370 (patch) | |
| tree | 54c2ba0a7d3abb156bc51f6b9f02e00f0a260f85 /fs/nfs/inode.c | |
| parent | 65bc98b0059360e458aebd208587be44641227c1 (diff) | |
| parent | 35b5c55fee08e6e4001ba98060a2d0b82f70b5f4 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/nfs/inode.c')
| -rw-r--r-- | fs/nfs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 64f87194d390..bd7938eda6a8 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/nfs_mount.h> | 30 | #include <linux/nfs_mount.h> |
| 31 | #include <linux/nfs4_mount.h> | 31 | #include <linux/nfs4_mount.h> |
| 32 | #include <linux/lockd/bind.h> | 32 | #include <linux/lockd/bind.h> |
| 33 | #include <linux/smp_lock.h> | ||
| 34 | #include <linux/seq_file.h> | 33 | #include <linux/seq_file.h> |
| 35 | #include <linux/mount.h> | 34 | #include <linux/mount.h> |
| 36 | #include <linux/nfs_idmap.h> | 35 | #include <linux/nfs_idmap.h> |