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-05-05 20:48:02 +02:00
2015-08-25 09:59:19 +02:00
2016-02-20 00:21:44 -05:00
2015-11-23 09:04:05 +01:00
2015-10-21 11:17:32 +02:00
2015-11-23 09:44:58 +01:00
2015-04-24 15:36:55 +02:00
2015-10-21 11:17:32 +02:00
2015-11-05 13:07:54 +01:00
2016-02-20 00:21:44 -05:00
2015-09-14 12:22:00 +02:00