David S. Miller 9f6e055907 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The mptcp conflict was overlapping additions.

The SMC conflict was an additional and removal happening at the same
time.

Signed-off-by: David S. Miller <davem@davemloft.net>
2020-02-27 18:31:39 -08:00
..
2019-11-16 12:26:49 -08:00
2019-10-22 11:23:44 -07:00
2018-11-21 16:14:56 -08:00
2018-05-04 11:45:06 -04:00