projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7477fd2 ef1a5a5)
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 patch | diff1 | diff2 | blob | history
net/ipv4/netfilter/nf_nat_core.c patch | diff1 | diff2 | blob | history

diff --cc net/ipv4/netfilter/ipt_CLUSTERIP.c
Simple merge
diff --cc net/ipv4/netfilter/nf_nat_core.c
Simple merge
John Crispins staging tree