]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 10 Mar 2007 06:04:27 +0000 (22:04 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 10 Mar 2007 06:04:27 +0000 (22:04 -0800)
commitdfe972fd9fc38e8fb186c9169015bfdc7c70607b
tree6a6e3d37210e723524deae2991e399e2c15d4d79
parent69f7973208cb3a0abb0e1a1dc50a9b043be7d818
parent282ef7012d2597c09e0c4854fd566c05e0bf756c
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.