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 /net/ipv4/raw.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 'net/ipv4/raw.c')
| -rw-r--r-- | net/ipv4/raw.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 34d9adb83590..bbda0d5f9244 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c | |||
| @@ -60,7 +60,6 @@ | |||
| 60 | #include <net/net_namespace.h> | 60 | #include <net/net_namespace.h> |
| 61 | #include <net/dst.h> | 61 | #include <net/dst.h> |
| 62 | #include <net/sock.h> | 62 | #include <net/sock.h> |
| 63 | #include <linux/gfp.h> | ||
| 64 | #include <linux/ip.h> | 63 | #include <linux/ip.h> |
| 65 | #include <linux/net.h> | 64 | #include <linux/net.h> |
| 66 | #include <net/ip.h> | 65 | #include <net/ip.h> |