]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5e7873d e93b5f9)
Merge branch 'master' of git://1984.lsi.us.es/nf
authorDavid S. Miller <davem@davemloft.net>
Thu, 22 Nov 2012 20:27:18 +0000 (15:27 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Nov 2012 20:27:18 +0000 (15:27 -0500)
commit84ec95b047d2d02552f07c06d9d6da8b61532090
tree3fc7861a6a2d1ad22722bb905bd3731623463f0ftree | snapshot
parent5e7873d1450e1809b017b943417530db3955ac5fcommit | diff
parente93b5f9f320db431ec8623a4c667811007e07fd7commit | diff
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>
Linux kernel for KaRo TX COM modules