tree 1507ed91bbbaec02273bf493fa13c2d0a383b6be
parent eb1ac820c61d0d83747f2575092451efc2be09e4
parent eaea2da7286ebc56d557b40ad7e59e715a84e4a0
author David S. Miller <davem@davemloft.net> 1404351854 -0700
committer David S. Miller <davem@davemloft.net> 1404351854 -0700

Merge branch 'sctp'

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 <davem@davemloft.net>
Acked-by: Neil Horman <nhorman@tuxdriver.com>