tree bf29814fd401872522563bb94067f4f38a575ea2
parent 059dfa6a93b779516321e5112db9d7621b1367ba
parent d954777324ffcba0b2f8119c102237426c654eeb
author David S. Miller <davem@davemloft.net> 1383080024 -0400
committer David S. Miller <davem@davemloft.net> 1383080024 -0400

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

Pablo Neira Ayuso says:

====================
This pull request contains the following netfilter fix:

* fix --queue-bypass in xt_NFQUEUE revision 3. While adding the
  revision 3 of this target, the bypass flags were not correctly
  handled anymore, thus, breaking packet bypassing if no application
  is listening from userspace, patch from Holger Eitzenberger,
  reported by Florian Westphal.
====================

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