summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/topology.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-11-29 06:28:14 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-29 06:28:14 +0100
commit1275361c407d17d56717cd706785a31c2353d696 (patch)
tree8bb04a9fe67f844e84691e53829813ca65b981b4 /arch/mips/kernel/topology.c
parentMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff)
parent[NET]: Fix MAX_HEADER setting. (diff)
downloadlinux-1275361c407d17d56717cd706785a31c2353d696.tar.xz
linux-1275361c407d17d56717cd706785a31c2353d696.zip
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 '')
0 files changed, 0 insertions, 0 deletions