David S. Miller 6abdd5f593 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-08-30 00:54:02 -04:00
..
cxgb3	Merge branches 'cxgb4' and 'mlx5' into k.o/for-4.8	2016-08-03 20:58:45 -04:00
cxgb4	iw_cxgb4: Fix cxgb4 arm CQ logic w/IB_CQ_REPORT_MISSED_EVENTS	2016-08-23 12:52:52 -04:00
hfi1	IB/hfi1: Fix mm_struct use after free	2016-08-22 15:00:42 -04:00
i40iw	i40iw: Send last streaming mode message for loopback connections	2016-08-25 11:15:47 -04:00
mlx4	IB/mlx4: Return EAGAIN for any error in mlx4_ib_poll_one	2016-08-22 14:26:53 -04:00
mlx5	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-30 00:54:02 -04:00
mthca	Merge branches 'misc' and 'rxe' into k.o/for-4.8-1	2016-08-04 11:13:47 -04:00
nes	IB/nes: Support device FW version string	2016-06-23 12:08:34 -04:00
ocrdma	RDMA/ocrdma: Fix the max_sge reported from FW	2016-08-24 11:31:40 -04:00
qib	IB/qib: Use memdup_user() rather than duplicating its implementation	2016-08-23 12:38:24 -04:00
usnic	IB/usnic: Fix error return code	2016-08-22 14:31:43 -04:00
Makefile	IB/hfi1: Move driver out of staging	2016-05-26 11:35:14 -04:00