Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net...
authorPatrick McHardy <kaber@trash.net>
Thu, 11 Jun 2009 14:00:49 +0000 (16:00 +0200)
committerPatrick McHardy <kaber@trash.net>
Thu, 11 Jun 2009 14:00:49 +0000 (16:00 +0200)
commit36432dae73cf2c90a59b39c8df9fd8219272b005
tree660b9104305a809ec4fdeb295ca13d6e90790ecc
parent440f0d588555892601cfe511728a0fc0c8204063
parentbb400801c2f40bbd9a688818323ad09abfc4e581
Merge branch 'master' of git://git./linux/kernel/git/davem/net-next-2.6
include/linux/netfilter/nf_conntrack_tcp.h
net/ipv4/netfilter/ipt_MASQUERADE.c
net/netfilter/nf_conntrack_proto_dccp.c
net/netfilter/nf_conntrack_proto_gre.c
net/netfilter/nf_conntrack_proto_tcp.c