projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eb1ac82
eaea2da
)
Merge branch 'sctp'
author
David S. Miller
<
[email protected]
>
Thu, 3 Jul 2014 01:44:14 +0000
(18:44 -0700)
committer
David S. Miller
<
[email protected]
>
Thu, 3 Jul 2014 01:44:14 +0000
(18:44 -0700)
Daniel Borkmann says:
====================
Misc SCTP updates
Daniel Borkmann (2):
net: sctp: improve timer slack calculation for transport HBs
net: sctp: only warn in proc_sctp_do_alpha_beta if write
====================
Signed-off-by: David S. Miller <
[email protected]
>
Acked-by: Neil Horman <
[email protected]
>
Trivial merge
projects / openwrt / staging / blogic.git / commitdiff