Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source

...

This commit is contained in:

Linus Torvalds 2005-12-02 23:09:38 -08:00

parent af2eb17bac af1afe8662

commit b3c6aeb3ce

6 changed files with 52 additions and 25 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

net/ipv4/af_inet.c

View file

5

net/ipv4/igmp.c

View file

47

net/ipv6/af_inet6.c

View file

5

net/ipv6/mcast.c

View file

10

net/sctp/socket.c

View file

3

net/sctp/transport.c

View file