summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-05-09 16:41:16 -0400
committerDavid S. Miller <davem@davemloft.net>2014-05-09 16:41:16 -0400
commit05ab2dae650e09add1c5295392b5516704c03a4b (patch)
tree53c95dea1f7859caf3a475e0dc04ad33565ca2ce /include/linux
parent93dccc59165ad1b4db94528dfdf88bff92c09cef (diff)
parentf66138c8471442c24c58cdce6ba5f36c5ce93d7a (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>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions