diff options
author | David S. Miller <davem@davemloft.net> | 2009-11-29 00:16:22 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-29 00:16:22 -0800 |
commit | 5656b6ca19c602a7074effae360e5a4dcfdc8170 (patch) | |
tree | 13eb8138999a3c6a8e6f92fb98b0cc54b7240c6a /net/netfilter/nfnetlink_log.c | |
parent | sfc: Clean up RX event handling (diff) | |
parent | sctp: prevent too-fast association id reuse (diff) | |
download | linux-dev-5656b6ca19c602a7074effae360e5a4dcfdc8170.tar.xz linux-dev-5656b6ca19c602a7074effae360e5a4dcfdc8170.zip |
Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev
Diffstat (limited to 'net/netfilter/nfnetlink_log.c')
0 files changed, 0 insertions, 0 deletions