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-04-24 12:07:08 -07:00
2016-12-26 21:35:39 -05:00
2016-06-18 21:34:09 -07:00
2018-07-23 21:17:44 -07:00
2018-07-23 21:17:44 -07:00
2019-02-04 14:59:11 -08:00