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-04-29 16:44:48 +02:00
2016-06-10 23:24:54 -07:00
2016-06-10 23:24:54 -07:00
2015-12-20 15:21:38 +05:30
2015-04-10 13:47:50 +02:00
2015-04-10 13:47:50 +02:00