tree e82858156bf5d46b539455728ac1b8a7cd9feb02
parent d34e14f690d611ffe3db09e4ed8123d86c89a831
parent c02db8c6290bb992442fec1407643c94cc414375
author Linus Torvalds <torvalds@linux-foundation.org> 1274033513 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1274033513 -0700

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  rtnetlink: make SR-IOV VF interface symmetric
  sctp: delete active ICMP proto unreachable timer when free transport
  tcp: fix MD5 (RFC2385) support