From: David S. Miller <davem@davemloft.net>
Date: Tue, 29 Oct 2013 20:53:44 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~67^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68783ec73c3b77b405f7670e37ecef15d25f5e55;p=pandora-kernel.git

Merge branch 'master' of git://git./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>
---

68783ec73c3b77b405f7670e37ecef15d25f5e55
Reading git-diff-tree failed