projects / kernel / kernel-generic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c995ae2 1205e1f)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
authorDavid S. Miller <davem@davemloft.net>
Wed, 4 Sep 2013 16:28:02 +0000 (12:28 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Sep 2013 16:28:02 +0000 (12:28 -0400)
commit48f8e0af8668351e249f817406c770a36e2274db
treeccc4d0f20ab64aba3de1ab6b0c797bbf6b1d678ctree | snapshot
parentc995ae2259ee36caf48bbfacf40111998dacd4afcommit | diff
parent1205e1fa615805c9efa97303b552cf445965752acommit | diff
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>
Domain: System / Uncategorized;