projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: de59985 0523820)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Oct 2008 16:37:04 +0000 (09:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Oct 2008 16:37:04 +0000 (09:37 -0700)
commitae1cfb1174c87b43b0639e35e782b7b2c95fb4ff
tree656145b6eaaa0b21848fa3a97a2de665f4a5ec7ctree | snapshot
parentde59985e3a623d4d5d6207f1777398ca0606ab1ccommit | diff
parent0523820482dcb42784572ffd2296c2f08c275a2bcommit | diff
Merge git://git./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
John Crispins staging tree