]> err.no Git - linux-2.6/commitdiff
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)
1  2 
net/ipv4/netfilter/ipt_CLUSTERIP.c
net/ipv4/netfilter/nf_nat_core.c

Simple merge
Simple merge