aboutsummaryrefslogtreecommitdiff
path: root/net/Makefile
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-11-03 23:05:16 -0500
committerDavid S. Miller <davem@davemloft.net>2013-11-03 23:05:16 -0500
commitb397f99921827e114d7f5600447e172a99c50165 (patch)
treede3bbb3dc4e08fd17fcde46aedb239d274e45d6b /net/Makefile
parent296c10639a33941d0090afa17b7535fcbf81d97a (diff)
parente6d8b64b34aa8a9fe39609bc2db8a243b0331ceb (diff)
downloadlinux-stericsson-b397f99921827e114d7f5600447e172a99c50165.tar.gz
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>
Diffstat (limited to 'net/Makefile')
0 files changed, 0 insertions, 0 deletions