David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Both conflict were simple overlapping changes.

In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the
conversion of the driver in net-next to use in-netdev stats.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-04-21 20:23:53 -07:00
..
2014-11-04 13:18:21 +01:00
2014-04-09 14:49:43 +02:00
2017-02-10 14:31:51 -05:00
2015-05-11 19:16:04 +02:00
2017-03-06 09:21:46 +01:00
2014-04-09 14:49:43 +02:00
2016-12-13 16:05:09 +01:00
2017-02-09 15:17:30 +01:00