Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
authorDavid S. Miller <davem@davemloft.net>
Wed, 28 Aug 2013 02:07:02 +0000 (22:07 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Aug 2013 02:07:02 +0000 (22:07 -0400)
commitb6750b4056720629e4c1e2e0d05f63692bffad27
tree5a02f12714f4f8333bb33753efce99a7ef400fb0
parent45cc3a0c9733d31589dc701da5d2fc18bd093a34
parentb7e092c05b308674c642ed7fb754d555f0ebba81
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>