projects / platform / kernel / linux-3.10.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e8f90d 7676e34)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 29 Jul 2011 01:38:53 +0000 (18:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Jul 2011 01:38:53 +0000 (18:38 -0700)
1  2 
net/netfilter/ipvs/ip_vs_ctl.c patch | diff1 | diff2 | blob | history

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge
Domain: System / Kernel;