git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d6169b0 c8d2bc9)

author	David S. Miller <davem@davemloft.net>
	Mon, 3 Oct 2016 01:17:07 +0000 (21:17 -0400)
committer	David S. Miller <davem@davemloft.net>
	Mon, 3 Oct 2016 02:20:41 +0000 (22:20 -0400)
commit	b50afd203a5ef1998c18d6519ad2b2c546d6af22
tree	608e6845e78a4ffe623c7cdf6581e29e2d9be0a9	tree \| snapshot
parent	d6169b0206db1c8c8d0e4c6b79fdf4b2fc6455f1	commit \| diff
parent	c8d2bc9bc39ebea8437fd974fdbc21847bb897a3	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Three sets of overlapping changes. Nothing serious.

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

16 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/tg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
include/net/sctp/structs.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ife.c	diff1 \|	diff2 \|	blob \| history
net/sctp/chunk.c	diff1 \|	diff2 \|	blob \| history
net/sctp/outqueue.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sctp_diag.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_make_chunk.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.