diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-26 09:03:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 09:05:21 -0500 |
| commit | 22a867d81707b0a2720bb5f65255265b95d30526 (patch) | |
| tree | 7ec19b155b50b13ae95244c2bfa16aea4920c4f6 /fs/reiserfs/ioctl.c | |
| parent | 5bb6b1ea67a73f0665a41726dd7138977b992c6c (diff) | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
Merge commit 'v2.6.37-rc3' into sched/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/reiserfs/ioctl.c')
| -rw-r--r-- | fs/reiserfs/ioctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c index adf22b485cea..bd9763e76bae 100644 --- a/fs/reiserfs/ioctl.c +++ b/fs/reiserfs/ioctl.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #include <linux/time.h> | 9 | #include <linux/time.h> |
| 10 | #include <asm/uaccess.h> | 10 | #include <asm/uaccess.h> |
| 11 | #include <linux/pagemap.h> | 11 | #include <linux/pagemap.h> |
| 12 | #include <linux/smp_lock.h> | ||
| 13 | #include <linux/compat.h> | 12 | #include <linux/compat.h> |
| 14 | 13 | ||
| 15 | /* | 14 | /* |