| commit | f47273e5c8f679220091335e0bed79e46237cfda | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Mar 09 22:04:27 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Mar 09 22:04:27 2007 -0800 |
| tree | 6a6e3d37210e723524deae2991e399e2c15d4d79 | |
| parent | f4cd87aabb51fcc709b0dacc05b718c400c64172 [diff] | |
| parent | d2b02ed9487ed25832d19534575052e43f8e0c4f [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: [IPV6] fix ipv6_getsockopt_sticky copy_to_user leak [IPV6]: Fix for ipv6_setsockopt NULL dereference [DCCP]: Initialise write_xmit_timer also on passive sockets [IPV4]: Fix rtm_to_ifaddr() error handling.