diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-29 00:28:14 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-29 00:28:14 -0500 |
| commit | 1275361c407d17d56717cd706785a31c2353d696 (patch) | |
| tree | 8bb04a9fe67f844e84691e53829813ca65b981b4 /arch/mips/kernel/Makefile | |
| 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
Diffstat (limited to 'arch/mips/kernel/Makefile')
0 files changed, 0 insertions, 0 deletions