| commit | 05ab2dae650e09add1c5295392b5516704c03a4b | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri May 09 16:41:16 2014 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Fri May 09 16:41:16 2014 -0400 |
| tree | 53c95dea1f7859caf3a475e0dc04ad33565ca2ce | |
| parent | 93dccc59165ad1b4db94528dfdf88bff92c09cef [diff] | |
| parent | f66138c8471442c24c58cdce6ba5f36c5ce93d7a [diff] |
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>