Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2...
authorDavid S. Miller <davem@davemloft.net>
Mon, 14 Apr 2008 10:50:43 +0000 (03:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Apr 2008 10:50:43 +0000 (03:50 -0700)
commit334f8b2afd9652e20f67ddee4fec483ed860425b
tree35d4fb46a9dc145e831fe5da026f2bfd9ee6657c
parent7477fd2e6b676fcd15861c2a96a7172f71afe0a5
parentef1a5a50bbd509b8697dcd4d13017e9e0053867b
Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-2.6.26
net/ipv4/netfilter/ipt_CLUSTERIP.c
net/ipv4/netfilter/nf_nat_core.c