projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
93dccc5
f66138c
)
Merge branch 'sctp_sysctl'
author
David S. Miller
<davem@davemloft.net>
Fri, 9 May 2014 20:41:16 +0000
(16:41 -0400)
committer
David S. Miller
<davem@davemloft.net>
Fri, 9 May 2014 20:41:16 +0000
(16:41 -0400)
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>
Trivial merge