tree 77aac489eb5de3682c5ae67501627170509d3f6f
parent dc95a2c00671cf383cd037d943fbfe178f9ba81a
parent 54d83efa44aac87983f973abb42c508a25a2b554
author David S. Miller <davem@davemloft.net> 1351276855 -0400
committer David S. Miller <davem@davemloft.net> 1351276855 -0400

Merge branch 'master' of git://1984.lsi.us.es/nf-next

Pablo Neira Ayuso says:

====================
The following changeset contains updates for IPVS from Jesper Dangaard
Brouer that did not reach the previous merge window in time.

More specifically, updates to improve IPv6 support in IPVS. More
relevantly, some of the existing code performed wrong handling of the
extensions headers and better fragmentation handling.

Jesper promised more follow-up patches to refine this after this batch
hits net-next. Yet to come.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>