diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-25 04:04:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-25 04:04:32 -0400 |
| commit | daedc71836e5a398fd0cc0e12c5cb43539478485 (patch) | |
| tree | c56567a92017679e57195cef992d4a5561c20e0e /fs/ext2 | |
| parent | c36ba80ea01d0aecb652c26799a912e760ce8981 (diff) | |
| parent | 422bef879e84104fee6dc68ded0e371dbeb5f88e (diff) | |
Merge commit 'v2.6.31-rc7' into irq/core
Merge reason: move from an -rc2 base to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/ioctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c index 7cb4badef927..e7431309bdca 100644 --- a/fs/ext2/ioctl.c +++ b/fs/ext2/ioctl.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 14 | #include <linux/compat.h> | 14 | #include <linux/compat.h> |
| 15 | #include <linux/mount.h> | 15 | #include <linux/mount.h> |
| 16 | #include <linux/smp_lock.h> | ||
| 17 | #include <asm/current.h> | 16 | #include <asm/current.h> |
| 18 | #include <asm/uaccess.h> | 17 | #include <asm/uaccess.h> |
| 19 | 18 | ||