projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb1ac82 eaea2da)
Merge branch 'sctp'
authorDavid S. Miller <davem@davemloft.net>
Thu, 3 Jul 2014 01:44:14 +0000 (18:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
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 <davem@davemloft.net>
Acked-by: Neil Horman <nhorman@tuxdriver.com>

Trivial merge