diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-04-20 10:02:01 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-04-20 10:02:01 -0400 |
| commit | 62910554656cdcd6b6f84a5154c4155aae4ca231 (patch) | |
| tree | dcf14004f6fd2ef7154362ff948bfeba0f3ea92d /arch/mips/kernel/linux32.c | |
| parent | 22265a5c3c103cf8c50be62e6c90d045eb649e6d (diff) | |
| parent | ab9304717f7624c41927f442e6b6d418b2d8b3e4 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
net/ipv6/netfilter/ip6t_REJECT.c
net/netfilter/xt_limit.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'arch/mips/kernel/linux32.c')
| -rw-r--r-- | arch/mips/kernel/linux32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index a39d0597a375..c2dab140dc98 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/time.h> | 15 | #include <linux/time.h> |
| 16 | #include <linux/times.h> | 16 | #include <linux/times.h> |
| 17 | #include <linux/poll.h> | 17 | #include <linux/poll.h> |
| 18 | #include <linux/slab.h> | ||
| 19 | #include <linux/skbuff.h> | 18 | #include <linux/skbuff.h> |
| 20 | #include <linux/filter.h> | 19 | #include <linux/filter.h> |
| 21 | #include <linux/shm.h> | 20 | #include <linux/shm.h> |
| @@ -34,6 +33,7 @@ | |||
| 34 | #include <linux/compat.h> | 33 | #include <linux/compat.h> |
| 35 | #include <linux/vfs.h> | 34 | #include <linux/vfs.h> |
| 36 | #include <linux/ipc.h> | 35 | #include <linux/ipc.h> |
| 36 | #include <linux/slab.h> | ||
| 37 | 37 | ||
| 38 | #include <net/sock.h> | 38 | #include <net/sock.h> |
| 39 | #include <net/scm.h> | 39 | #include <net/scm.h> |