From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Wed, 29 Nov 2006 05:28:14 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.19~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1275361c407d17d56717cd706785a31c2353d696;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:
  [NET]: Fix MAX_HEADER setting.
  [NETFILTER]: ipt_REJECT: fix memory corruption
  [NETFILTER]: conntrack: fix refcount leak when finding expectation
  [NETFILTER]: ctnetlink: fix reference count leak
  [NETFILTER]: nf_conntrack: fix the race on assign helper to new conntrack
  [NETFILTER]: nfctnetlink: assign helper to newly created conntrack
---

1275361c407d17d56717cd706785a31c2353d696