]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit346955de81e81352b2fcbf67a5adc788b617bf48
tree660b9104305a809ec4fdeb295ca13d6e90790ecc
parentca40cd945daf4baa3cd6894da42a1c7bee8e0025
parent5e78376a8fd5202ae41b38e59bbadada1206cd35
Merge branch 'master' of git://git.kernel.org/pub/scm/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