]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4f404ca e81c735)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 29 Nov 2006 05:28:14 +0000 (21:28 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 29 Nov 2006 05:28:14 +0000 (21:28 -0800)
commit1275361c407d17d56717cd706785a31c2353d696
tree8bb04a9fe67f844e84691e53829813ca65b981b4tree | snapshot
parent4f404caf6791227754d67679d0b2350afc1ad522commit | diff
parente81c73596704793e73e6dbb478f41686f15a4b34commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.