David S. Miller 68aaf44595 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-27 14:23:31 -07:00
..
2019-05-21 12:33:38 -07:00
2019-08-19 18:22:54 -07:00
2019-08-20 12:48:06 -07:00
2019-05-28 21:37:30 -07:00
2019-07-18 11:49:46 -07:00