summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-11-28 21:28:14 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-28 21:28:14 -0800
commit1275361c407d17d56717cd706785a31c2353d696 (patch)
tree8bb04a9fe67f844e84691e53829813ca65b981b4 /arch/mips/kernel/Makefile
parent4f404caf6791227754d67679d0b2350afc1ad522 (diff)
parente81c73596704793e73e6dbb478f41686f15a4b34 (diff)
downloadblackbird-op-linux-1275361c407d17d56717cd706785a31c2353d696.tar.gz
blackbird-op-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 'arch/mips/kernel/Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud