diff options
author | David S. Miller <davem@davemloft.net> | 2014-05-09 16:41:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-09 16:41:16 -0400 |
commit | 05ab2dae650e09add1c5295392b5516704c03a4b (patch) | |
tree | 53c95dea1f7859caf3a475e0dc04ad33565ca2ce /net/phonet | |
parent | mdio_bus: fix devm_mdiobus_alloc_size export (diff) | |
parent | sctp: add a checking for sctp_sysctl_net_register (diff) | |
download | linux-dev-05ab2dae650e09add1c5295392b5516704c03a4b.tar.xz linux-dev-05ab2dae650e09add1c5295392b5516704c03a4b.zip |
Merge branch 'sctp_sysctl'
Wang Weidong says:
====================
sctp: fix kfree static array pointer in sctp_sysctl_net_unregister
patch #1 revert the efb842c45("sctp: optimize the sctp_sysctl_net_register")
patch #2 add a checking for sctp_sysctl_net_register
====================
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/phonet')
0 files changed, 0 insertions, 0 deletions