From: David S. Miller <davem@davemloft.net>
Date: Mon, 22 Jul 2013 21:32:39 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: v3.12-rc1~330^2~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7bd04bcf91e77bd0fe01c180546aacab4c7934be;p=kernel%2Fkernel-generic.git

Merge branch 'master' of git://git./linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
The following patchset contains Netfilter fixes for your net tree,
they are:

* Fix potential NULL dereference in the socket match if revision 0
  is used, from Eric Dumazet.

* Fix missing expectation NAT initialization that results in dumping
  the NAT part via ctnetlink, thus leading to problems in expectation
  synchronization through conntrackd, from myself.
====================

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

7bd04bcf91e77bd0fe01c180546aacab4c7934be