| commit | ae1cfb1174c87b43b0639e35e782b7b2c95fb4ff | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 01 09:37:04 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 01 09:37:04 2008 -0700 |
| tree | 656145b6eaaa0b21848fa3a97a2de665f4a5ec7c | |
| parent | de59985e3a623d4d5d6207f1777398ca0606ab1c [diff] | |
| parent | 0523820482dcb42784572ffd2296c2f08c275a2b [diff] |
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: af_key: Free dumping state on socket close XFRM,IPv6: initialize ip6_dst_blackhole_ops.kmem_cachep ipv6: NULL pointer dereferrence in tcp_v6_send_ack tcp: Fix NULL dereference in tcp_4_send_ack() sctp: Fix kernel panic while process protocol violation parameter iucv: Fix mismerge again. ipsec: Fix pskb_expand_head corruption in xfrm_state_check_space