| commit | 1275361c407d17d56717cd706785a31c2353d696 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.osdl.org> | Tue Nov 28 21:28:14 2006 -0800 |
| committer | Linus Torvalds <torvalds@woody.osdl.org> | Tue Nov 28 21:28:14 2006 -0800 |
| tree | 8bb04a9fe67f844e84691e53829813ca65b981b4 | |
| parent | 4f404caf6791227754d67679d0b2350afc1ad522 [diff] | |
| parent | e81c73596704793e73e6dbb478f41686f15a4b34 [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