commit b397f99921827e114d7f5600447e172a99c50165
author David S. Miller <davem@davemloft.net> Sun Nov 03 23:05:16 2013 -0500
committer David S. Miller <davem@davemloft.net> Sun Nov 03 23:05:16 2013 -0500
tree de3bbb3dc4e08fd17fcde46aedb239d274e45d6b
parent 296c10639a33941d0090afa17b7535fcbf81d97a
parent e6d8b64b34aa8a9fe39609bc2db8a243b0331ceb

Merge branch 'sctp_csum'

Daniel Borkmann says:

====================
SCTP fix/updates

Please see patch 5 for the main description/motivation, the rest just
brings in the needed functionality for that. Although this is actually
a fix, I've based it against net-next as some additional work for
fixing it was needed.
====================

Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>