summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-06-29 16:35:53 -0700
committerDavid S. Miller <davem@davemloft.net>2012-06-29 16:35:53 -0700
commit0c12d91b7064e16e96939243187b12fbd99caac7 (patch)
tree53fdcb3dda55a4089289856439a654c66839f8f6 /block
parent76fbc247b9aebc30f6d2c8ec1f69edcb68eaa328 (diff)
parent4009e18851ea555959c6017d848983b3d60bf667 (diff)
downloadop-kernel-dev-0c12d91b7064e16e96939243187b12fbd99caac7.zip
op-kernel-dev-0c12d91b7064e16e96939243187b12fbd99caac7.tar.gz
Merge branch 'master' of git://1984.lsi.us.es/nf
Pablo Neira Ayuso says: ==================== The following are 4 fixes and the update of the MAINTAINERS file to point to my Netfilter trees. They are: * One refcount leak fix in IPVS IPv6 support from Eric Dumazet. * One fix for interface comparison in ipset hash-netiface sets from Florian Westphal. * One fix for a missing rcu_read_unlock in nfnetlink from Tomasz Bursztyka. * One fix for a kernel crash if IPSET_CMD_NONE is set to ipset via nfnetlink, again from Tomasz Bursztyka. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud