aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/nf_conntrack_netlink.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-24 14:30:13 -0800
committerDavid S. Miller <davem@davemloft.net>2011-01-24 14:30:13 -0800
commitc2df88cbb43c25db27fbbf94e92318bdad018f3e (patch)
treedc41466a193f85e3a7cc8baf1f78f2b55b62aabc /net/netfilter/nf_conntrack_netlink.c
parentMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentgenirq: Add IRQ affinity notifiers (diff)
downloadlinux-dev-c2df88cbb43c25db27fbbf94e92318bdad018f3e.tar.xz
linux-dev-c2df88cbb43c25db27fbbf94e92318bdad018f3e.zip
Merge branch 'irq/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
0 files changed, 0 insertions, 0 deletions