]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 41f530d 6855ed6)
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)
commit6868542528a736e28c64c3b71d6a60eaed7b6b35
tree91aa4f8be6df4494276d1a064d9f8f2b994aa367tree | snapshot
parent41f530daf4b07557568acf04d1bda1f63e8ce961commit | diff
parent6855ed653b28e0f332bb3528e8b57df723858e22commit | diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 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
include/linux/netdevice.h diff1 | diff2 | blob | history
include/net/sctp/sctp.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.