projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit239960d66425785affb92d745e3b29e3e9b51745
tree1507ed91bbbaec02273bf493fa13c2d0a383b6betree | snapshot
parenteb1ac820c61d0d83747f2575092451efc2be09e4commit | diff
parenteaea2da7286ebc56d557b40ad7e59e715a84e4a0commit | diff
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>
ep93xx device tree rework repo: git://git.maquefel.me/linux.git