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-05-27 15:26:11 -07:00
2016-06-28 05:26:14 -04:00
2016-07-05 14:08:47 -07:00
2016-05-29 22:33:25 -07:00
2016-06-16 17:12:07 -07:00
2016-06-09 23:41:03 -07:00
2016-05-08 23:46:14 -04:00