Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Merge in networking bug fixes for merge window.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/dsa/sja1105/sja1105_main.c
Simple merge

diff --cc include/net/sctp/structs.h
Simple merge

diff --cc net/sctp/associola.c
Simple merge

diff --cc net/sctp/endpointola.c
Simple merge