From: David S. Miller <davem@davemloft.net>
Date: Thu, 22 Nov 2012 20:27:18 +0000 (-0500)
Subject: Merge branch 'master' of git://1984.lsi.us.es/nf
X-Git-Tag: v3.7-rc7~13^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=84ec95b047d2d02552f07c06d9d6da8b61532090;p=linux.git

Merge branch 'master' of git://1984.lsi.us.es/nf

Pablo Neira Ayuso says:

====================
The following patchset contains two Netfilter fixes:

* Fix buffer overflow in the name of the timeout policy object
  in the cttimeout infrastructure, from Florian Westphal.

* Fix a bug in the hash set in case that IP ranges are
  specified, from Jozsef Kadlecsik.
====================

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

84ec95b047d2d02552f07c06d9d6da8b61532090