diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-01 02:55:20 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-01 02:55:20 -0500 |
| commit | 35858adbfca13678af99fb31618ef4428d6dedb0 (patch) | |
| tree | 3336feaa61324486945816cb52c347733e7c0821 /fs/nfsctl.c | |
| parent | 197d4db752e67160d79fed09968c2140376a80a3 (diff) | |
| parent | 4b70858ba8d4537daf782defebe5f2ff80ccef2b (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/nfsctl.c')
| -rw-r--r-- | fs/nfsctl.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfsctl.c b/fs/nfsctl.c index 8f9a20556f79..d3854d94b7cf 100644 --- a/fs/nfsctl.c +++ b/fs/nfsctl.c | |||
| @@ -7,8 +7,6 @@ | |||
| 7 | #include <linux/types.h> | 7 | #include <linux/types.h> |
| 8 | #include <linux/file.h> | 8 | #include <linux/file.h> |
| 9 | #include <linux/fs.h> | 9 | #include <linux/fs.h> |
| 10 | #include <linux/sunrpc/svc.h> | ||
| 11 | #include <linux/nfsd/nfsd.h> | ||
| 12 | #include <linux/nfsd/syscall.h> | 10 | #include <linux/nfsd/syscall.h> |
| 13 | #include <linux/cred.h> | 11 | #include <linux/cred.h> |
| 14 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |