From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 30 May 2006 18:31:10 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=d1b3f96b0f9c1d9bc305a4d14bee0dc3509101a0;p=linux-edison.git

Merge /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)
---

d1b3f96b0f9c1d9bc305a4d14bee0dc3509101a0