]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 30 May 2006 18:31:10 +0000 (11:31 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 30 May 2006 18:31:10 +0000 (11:31 -0700)
commit569cb096ea39a126beddb5907d9847ef2b3df8ae
tree663f12dd5895b62858d89f37036604d282532848
parentc5aeb413627f9e009c8f59c9d8e06b8fe16f442b
parente25a5c60527afc8a42a8b4070891bf70cb7dafe9
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:
  [NETFILTER]: PPTP helper: fix sstate/cstate typo
  [NETFILTER]: mark H.323 helper experimental
  [NETFILTER]: Fix small information leak in SO_ORIGINAL_DST (CVE-2006-1343)