David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
associola.c	sctp: apply rhashtable api to send/recv path	2016-01-05 12:24:01 -05:00
auth.c	sctp: translate host order to network order when setting a hmacid	2015-11-15 18:27:27 -05:00
bind_addr.c
chunk.c	sctp: remove the unused sctp_datamsg_free()	2016-02-17 15:41:54 -05:00
debug.c
endpointola.c	sctp: the temp asoc's transports should not be hashed/unhashed	2016-01-17 19:11:44 -05:00
input.c	sctp: move rcu_read_lock from __sctp_lookup_association to sctp_lookup_association	2016-02-17 15:41:54 -05:00
inqueue.c
ipv6.c	ipv6: sctp: clone options to avoid use after free	2015-12-11 20:18:40 -05:00
Kconfig
Makefile
objcnt.c
output.c	sctp: Rename NETIF_F_SCTP_CSUM to NETIF_F_SCTP_CRC	2015-12-15 16:49:58 -05:00
outqueue.c	sctp: start t5 timer only when peer rwnd is 0 and local state is SHUTDOWN_PENDING	2015-12-06 22:31:51 -05:00
primitive.c
probe.c
proc.c	sctp: remove rcu_read_lock in sctp_seq_dump_remote_addrs()	2016-02-17 15:41:54 -05:00
protocol.c	sctp: Fix port hash table size computation	2016-02-21 21:52:51 -05:00
sm_make_chunk.c	sctp: use the same clock as if sock source timestamps were on	2015-12-05 22:23:22 -05:00
sm_sideeffect.c	sctp: remove the dead field of sctp_transport	2016-01-28 15:59:32 -08:00
sm_statefuns.c	sctp: fix use-after-free in pr_debug statement	2016-01-11 17:13:01 -05:00
sm_statetable.c
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
ssnmap.c
sysctl.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-01-11 23:55:43 -05:00
transport.c	sctp: remove the dead field of sctp_transport	2016-01-28 15:59:32 -08:00
tsnmap.c
ulpevent.c
ulpqueue.c