diff options
| author | James Morris <jmorris@namei.org> | 2009-07-13 10:30:40 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-07-13 10:30:40 -0400 |
| commit | 7d45ecafb6792ca68da9517969d37d910601845f (patch) | |
| tree | a98b1074e5577e66a97963745f975404d0aac266 /fs/nfs/nfs4proc.c | |
| parent | be940d6279c30a2d7c4e8d1d5435f957f594d66d (diff) | |
| parent | 7638d5322bd89d49e013a03fe2afaeb6d214fabd (diff) | |
Merge branch 'master' into next
Conflicts:
include/linux/personality.h
Use Linus' version.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 92ce43517814..ff0c080db59b 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | #include <linux/nfs4.h> | 45 | #include <linux/nfs4.h> |
| 46 | #include <linux/nfs_fs.h> | 46 | #include <linux/nfs_fs.h> |
| 47 | #include <linux/nfs_page.h> | 47 | #include <linux/nfs_page.h> |
| 48 | #include <linux/smp_lock.h> | ||
| 49 | #include <linux/namei.h> | 48 | #include <linux/namei.h> |
| 50 | #include <linux/mount.h> | 49 | #include <linux/mount.h> |
| 51 | #include <linux/module.h> | 50 | #include <linux/module.h> |