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
..
core	IB/core: Fix reading capability mask of the port info class	2016-02-11 11:05:56 -05:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
ulp	IB/ipoib: fix for rare multicast join race condition	2016-02-12 14:53:22 -05:00
Kconfig	IB/cma: Add configfs for rdma_cm	2015-12-23 10:39:52 -05:00
Makefile