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-03-02 14:13:19 -05:00
2016-03-02 14:13:17 -05:00
2016-07-01 16:45:17 -04:00
2013-03-08 00:35:44 -05:00
2016-06-18 21:34:09 -07:00
2011-07-01 16:16:19 -07:00
2016-06-18 21:34:09 -07:00