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
..
cxgb	chelsio: constify cphy_ops structures	2016-01-04 21:58:28 -05:00
cxgb3	cxgb3: fix up vpd strings for kstrto*()	2016-02-19 15:49:31 -05:00
cxgb4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
cxgb4vf	cxgb4vf: Use __dev_uc_sync/__dev_mc_sync to sync MAC address	2016-02-18 14:16:12 -05:00
Kconfig	cxgb4/cxgb4vf: update Kconfig file to include T6 adapter	2015-12-08 22:43:14 -05:00
Makefile