From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 10 Mar 2007 06:04:27 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.21-rc4~50
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f47273e5c8f679220091335e0bed79e46237cfda;p=linux-2.6-omap-h63xx.git

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.
---

f47273e5c8f679220091335e0bed79e46237cfda