David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-02-23 00:09:14 -05:00
..
2015-12-04 22:46:25 +01:00
2015-04-11 22:27:55 -04:00
2015-11-19 17:51:48 +01:00
2016-01-22 18:04:28 -05:00
2016-01-22 18:04:28 -05:00
2015-12-14 14:54:37 -05:00
2015-04-12 21:03:31 +02:00
2016-01-14 16:00:49 -08:00
2016-01-26 11:08:35 +01:00
2015-11-23 09:44:58 +01:00
2014-12-04 14:34:54 -05:00
2015-01-17 10:02:23 +13:00
2016-01-22 18:04:28 -05:00
2014-12-10 17:41:10 -08:00