Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 8 Mar 2007 23:09:57 +0000 (15:09 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 8 Mar 2007 23:09:57 +0000 (15:09 -0800)
commitc5bfdb7261f2c426c730b65ce59440e8de219fda
tree45fae681dd57a39cbaed470751926ce79a4b1fc9
parent2ef550790ac0d7bb0da1c6432f69f86f55ac1695
parente2eb8d452827b8d1f73db384cd7c6482eac29478
Merge /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