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
..
cxgb3	iw_cxgb3: Fix incorrectly returning error on success	2015-12-24 00:17:30 -05:00
cxgb4	cxgb4/iw_cxgb4: TOS support	2016-02-11 07:13:23 -05:00
mlx4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-22 12:18:07 -08:00
mlx5	IB/mlx5: Fix RC transport send queue overhead computation	2016-02-12 14:56:08 -05:00
mthca	IB: remove in-kernel support for memory windows	2015-12-23 14:29:04 -05:00
nes	RDMA/nes: Replace LRO with GRO	2016-02-17 16:15:45 -05:00
ocrdma	RDMA/ocrdma: Fix arm logic to align with new cq API	2016-02-17 10:07:20 -05:00
qib	Initial roundup of 4.5 merge window patches	2016-01-23 18:45:06 -08:00
usnic	IB/usnic: delete unneeded IS_ERR test	2015-12-23 10:50:58 -05:00
Makefile	IB/ehca: Deprecate driver, move to staging, schedule deletion	2015-09-11 18:13:35 -04:00