git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 28f9d1a 49a5785)

author	David S. Miller <davem@davemloft.net>
	Mon, 21 Jan 2019 22:41:32 +0000 (14:41 -0800)
committer	David S. Miller <davem@davemloft.net>
	Mon, 21 Jan 2019 22:41:32 +0000 (14:41 -0800)
commit	fa7f3a8d56b38a3ed1880a3780afba82387da277
tree	a4628ee966f21963e5e97a6d1a227a3e8138183e	tree \| snapshot
parent	28f9d1a3d4fecdb2352d3984ddeec88146385885	commit \| diff
parent	49a57857aeea06ca831043acbb0fa5e0f50602fd	commit \| diff

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

Completely minor snmp doc conflict.

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

15 files changed:

Documentation/networking/snmp_counter.rst	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macvlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/mdio_bus.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_fdb.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree