| commit | c5bfdb7261f2c426c730b65ce59440e8de219fda | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Mar 08 15:09:57 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Mar 08 15:09:57 2007 -0800 |
| tree | 45fae681dd57a39cbaed470751926ce79a4b1fc9 | |
| parent | 2ef550790ac0d7bb0da1c6432f69f86f55ac1695 [diff] | |
| parent | e2eb8d452827b8d1f73db384cd7c6482eac29478 [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: [SCTP] ipv6: inconsistent lock state ipv6_add_addr/sctp_v6_copy_addrlist