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/autofs4/dev-ioctl.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/autofs4/dev-ioctl.c')
| -rw-r--r-- | fs/autofs4/dev-ioctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c index f3da2eb51f56..00bf8fcb245f 100644 --- a/fs/autofs4/dev-ioctl.c +++ b/fs/autofs4/dev-ioctl.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 20 | #include <linux/compat.h> | 20 | #include <linux/compat.h> |
| 21 | #include <linux/syscalls.h> | 21 | #include <linux/syscalls.h> |
| 22 | #include <linux/smp_lock.h> | ||
| 23 | #include <linux/magic.h> | 22 | #include <linux/magic.h> |
| 24 | #include <linux/dcache.h> | 23 | #include <linux/dcache.h> |
| 25 | #include <linux/uaccess.h> | 24 | #include <linux/uaccess.h> |