From: David S. Miller <davem@davemloft.net>
Date: Wed, 4 Sep 2013 16:28:02 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
X-Git-Tag: v3.12-rc1~132^2~34
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48f8e0af8668351e249f817406c770a36e2274db;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'master' of git://git./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>
---

48f8e0af8668351e249f817406c770a36e2274db