| commit | 48f8e0af8668351e249f817406c770a36e2274db | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Sep 04 12:28:02 2013 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Wed Sep 04 12:28:02 2013 -0400 |
| tree | ccc4d0f20ab64aba3de1ab6b0c797bbf6b1d678c | |
| parent | c995ae2259ee36caf48bbfacf40111998dacd4af [diff] | |
| parent | 1205e1fa615805c9efa97303b552cf445965752a [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next Pablo Neira Ayuso says: ==================== The following batch contains: * Three fixes for the new synproxy target available in your net-next tree, from Jesper D. Brouer and Patrick McHardy. * One fix for TCPMSS to correctly handling the fragmentation case, from Phil Oester. I'll pass this one to -stable. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>