git.rot13.org Git - linux/commit

projects / linux / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: be1b6e8 5b7d279)

author	David S. Miller <davem@davemloft.net>
	Thu, 25 Jan 2018 04:44:15 +0000 (23:44 -0500)
committer	David S. Miller <davem@davemloft.net>
	Thu, 25 Jan 2018 04:44:15 +0000 (23:44 -0500)
commit	955bd1d216c6ce4f40b181cfd369f4116e0627f2
tree	d3f2669d3abb1c53c2f364732e8122ce0f25e3da	tree \| snapshot
parent	be1b6e8b5470e8311bfa1a3dfd7bd59e85a99759	commit \| diff
parent	5b7d27967dabfb17c21b0d98b29153b9e3ee71e5	commit \| diff

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

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

13 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/emac/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/emac/emac.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_rdma.c	diff1 \|	diff2 \|	blob \| history
include/net/ipv6.h	diff1 \|	diff2 \|	blob \| history
include/net/pkt_cls.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/xfrm4_mode_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/xfrm6_mode_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_device.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_state.c	diff1 \|	diff2 \|	blob \| history

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