]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a584573 196a744)
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)
commit7c3fd32dfc292f840123c00376756b755ad7f338
tree1507ed91bbbaec02273bf493fa13c2d0a383b6betree | snapshot
parenta584573928e4e9ae9948ff1ca56a1d00ef25099ecommit | diff
parent196a744ab8d7d8486eb7a7f695ad7f07ab92133acommit | 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>
Linux Kernel Source Tree.