tree 91aa4f8be6df4494276d1a064d9f8f2b994aa367
parent be883da7594b0a2a02074e683673ae0e522566a4
parent ff7512e1a2a3504649d3716a757f43807b6d26ef
author Linus Torvalds <torvalds@g5.osdl.org> 1150850393 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1150850393 -0700

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