David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-07-06 10:35:22 -07:00
..
2016-06-30 23:28:09 -04:00
2016-06-10 18:14:47 -07:00
2016-05-20 17:58:30 -07:00
2016-06-30 13:10:49 +02:00
2016-06-28 16:55:34 -04:00
2016-04-26 12:00:48 -04:00
2016-06-23 00:29:53 +02:00
2016-05-23 17:04:14 -07:00
2016-05-26 19:34:26 -07:00
2016-06-07 22:07:09 -04:00
2016-06-27 12:18:44 -07:00
2016-06-10 11:32:47 -04:00
2016-05-23 17:04:14 -07:00
2016-06-20 17:11:29 -04:00
2016-07-01 10:24:18 -04:00
2016-06-24 12:11:34 -04:00
2016-04-18 11:18:55 +02:00