diff options
author | 2007-02-17 15:11:43 -0500 | |
---|---|---|
committer | 2007-02-17 15:11:43 -0500 | |
commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /net/sctp/ipv6.c | |
parent | Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream (diff) | |
parent | Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 (diff) | |
download | linux-dev-f630fe2817601314b2eb7ca5ddc23c7834646731.tar.xz linux-dev-f630fe2817601314b2eb7ca5ddc23c7834646731.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'net/sctp/ipv6.c')
-rw-r--r-- | net/sctp/ipv6.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index 01b27fb5dfc5..63fe1093b616 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -53,7 +53,6 @@ #include <linux/socket.h> #include <linux/sockios.h> #include <linux/net.h> -#include <linux/sched.h> #include <linux/in.h> #include <linux/in6.h> #include <linux/netdevice.h> |