projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8ac2bde d770108)
Merge branch 'ipvs-next'
authorPablo Neira Ayuso <pablo@netfilter.org>
Thu, 30 Oct 2014 15:51:25 +0000 (16:51 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 30 Oct 2014 15:52:30 +0000 (16:52 +0100)
commitc3ac759ea6e9836d3040abed92f797383da4024f
tree5bb7c634212871c4afa42fc6c6b3a36b58066029tree | snapshot
parent8ac2bde2a4a05c38e2bd733bea94507cb1461e06commit | diff
parentd7701089118d23bfed03bad0a6b5cc5115990c9ecommit | diff
Merge branch 'ipvs-next'

Simon Horman says:

====================
The single patch in this series fixes some minor fallout from adding
support IPv6 real servers in IPv4 virtual-services and vice versa.

It should not have any run-time affect other than perhaps saving a few cycles.
====================

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Unnamed repository; edit this file 'description' to name the repository.