]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be883da ff7512e)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 21 Jun 2006 00:39:53 +0000 (17:39 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 21 Jun 2006 00:39:53 +0000 (17:39 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [ATM]: fix broken uses of NIPQUAD in net/atm
  [SCTP]: sctp_unpack_cookie() fix
  [SCTP]: Fix unintentional change to SCTP_ASSERT when !SCTP_DEBUG
  [NET]: Prevent multiple qdisc runs
  [CONNECTOR]: Initialize subsystem earlier.
  [NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length

1  2 
include/linux/netdevice.h patch | diff1 | diff2 | blob | history
include/net/sctp/sctp.h patch | diff1 | diff2 | blob | history

diff --cc include/linux/netdevice.h
Simple merge
diff --cc include/net/sctp/sctp.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.