diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /fs/compat_ioctl.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/compat_ioctl.c')
| -rw-r--r-- | fs/compat_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 6d55b61bfa7..c32a1b6a856 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/ioctl.h> | 23 | #include <linux/ioctl.h> |
| 24 | #include <linux/if.h> | 24 | #include <linux/if.h> |
| 25 | #include <linux/if_bridge.h> | 25 | #include <linux/if_bridge.h> |
| 26 | #include <linux/slab.h> | ||
| 27 | #include <linux/raid/md_u.h> | 26 | #include <linux/raid/md_u.h> |
| 28 | #include <linux/kd.h> | 27 | #include <linux/kd.h> |
| 29 | #include <linux/route.h> | 28 | #include <linux/route.h> |
| @@ -60,6 +59,7 @@ | |||
| 60 | #include <linux/i2c.h> | 59 | #include <linux/i2c.h> |
| 61 | #include <linux/i2c-dev.h> | 60 | #include <linux/i2c-dev.h> |
| 62 | #include <linux/atalk.h> | 61 | #include <linux/atalk.h> |
| 62 | #include <linux/gfp.h> | ||
| 63 | 63 | ||
| 64 | #include <net/bluetooth/bluetooth.h> | 64 | #include <net/bluetooth/bluetooth.h> |
| 65 | #include <net/bluetooth/hci.h> | 65 | #include <net/bluetooth/hci.h> |