tree 663f12dd5895b62858d89f37036604d282532848
parent 47ce56edb8ecdd4ec2bbec4e8683f3ba91de72e3
parent 7114b0bb6df7b2db266ba4847e4dd8333fa98a9a
author Linus Torvalds <torvalds@g5.osdl.org> 1149013870 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1149013870 -0700

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)