From: David S. Miller <davem@davemloft.net>
Date: Thu, 3 Jul 2014 01:44:14 +0000 (-0700)
Subject: Merge branch 'sctp'
X-Git-Tag: v3.17-rc1~106^2~232
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=239960d66425785affb92d745e3b29e3e9b51745;p=linux.git

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>
---

239960d66425785affb92d745e3b29e3e9b51745