diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-19 14:24:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-19 14:24:47 -0400 |
| commit | fd7fc253289c419615c1c8bbe418598019567392 (patch) | |
| tree | d86653f4f9ce591d0be0e67050a849ebd40f8f14 /net/irda | |
| parent | 6a4cd3fde5894b663ab27e4d7157ad91e24141b7 (diff) | |
| parent | f83a7ea2075ca896f2dbf07672bac9cf3682ff74 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
If time allows, please consider pulling the following patchset contains two
late Netfilter fixes, they are:
* Skip broadcast/multicast locally generated traffic in the rpfilter,
(closes netfilter bugzilla #814), from Florian Westphal.
* Fix missing elements in the listing of ipset bitmap ip,mac set
type with timeout support enabled, from Jozsef Kadlecsik.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda')
0 files changed, 0 insertions, 0 deletions