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
..
core	IB/core: Fix possible memory leak in cma_resolve_iboe_route()	2016-08-22 14:26:54 -04:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-30 00:54:02 -04:00
sw	IB/rdmvat: Fix double vfree() in rvt_create_qp() error path	2016-08-22 15:00:42 -04:00
ulp	IB/srpt: Update sport->port_guid with each port refresh	2016-08-24 16:51:16 -04:00
Kconfig	Soft RoCE driver	2016-08-04 11:13:12 -04:00
Makefile	IB/rdmavt: Create module framework and handle driver registration	2016-03-10 20:37:04 -05:00