From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 8 Mar 2007 23:09:57 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.21-rc4~80
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5bfdb7261f2c426c730b65ce59440e8de219fda;p=linux-2.6

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:
  [SCTP] ipv6: inconsistent lock state ipv6_add_addr/sctp_v6_copy_addrlist
---

c5bfdb7261f2c426c730b65ce59440e8de219fda