]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 21 Apr 2018 20:31:52 +0000 (16:31 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Apr 2018 20:32:48 +0000 (16:32 -0400)
commit1f6a70cb728f1450d6a9d08a6a9e663a1a8467b7
tree858966cee69ad8a50e59c4e02dcbde6ba2916151
parent08cb87655dc4b20e0c15f73a4f5a29c979dfc79a
parent8b16ced9dc79a0ddf2c2b582a4f70b98ceab39ac
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts were simple overlapping changes in microchip
driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/phy/microchip.c
drivers/net/team/team.c
drivers/net/tun.c
drivers/net/virtio_net.c
include/linux/microchipphy.h
net/core/dev.c
net/ipv4/tcp.c
net/tipc/node.c
tools/testing/selftests/net/Makefile