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

Browse source

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NETPOLL]: Fixups for 'fix soft lockup when removing module'
  [NET]: net/core/netevent.c should #include <net/netevent.h>
  [NETFILTER]: nf_conntrack_h323: add checking of out-of-range on choices' index values
  [NET] skbuff: remove export of static symbol
  SCTP: Add scope_id validation for link-local binds
  SCTP: Check to make sure file is valid before setting timeout
  SCTP: Fix thinko in sctp_copy_laddrs()

...

This commit is contained in:

Linus Torvalds 2007-07-06 10:30:12 -07:00

parent dadde13ad8 25442cafb8

commit 1feb17e286

6 changed files with 20 additions and 8 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

1

net/core/netevent.c

View file

6

net/core/netpoll.c

View file

1

net/core/skbuff.c

View file

4

net/netfilter/nf_conntrack_h323_asn1.c

View file

4

net/sctp/ipv6.c

View file

12

net/sctp/socket.c

View file