From: David S. Miller <davem@davemloft.net>
Date: Wed, 28 Aug 2013 02:07: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~167
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6750b4056720629e4c1e2e0d05f63692bffad27;p=kernel%2Fkernel-generic.git

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

Pablo Neira Ayuso says:

====================
The following patchset contains Netfilter updates for your net-next tree,
they are:

* The new SYNPROXY target for iptables, including IPv4 and IPv6 support,
  from Patrick McHardy.

* nf_defrag_ipv6.o should be only linked to nf_defrag_ipv6.ko, from
  Nathan Hintz.

* Fix an old bug in REJECT, which replies with wrong MAC source address
  from the bridge, by Phil Oester.

* Fix uninitialized helper variable in the expectation support over
  nfnetlink_queue, from Florian Westphal.
====================

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

b6750b4056720629e4c1e2e0d05f63692bffad27