David S. Miller 29fda25a2d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two minor conflicts in virtio_net driver (bug fix overlapping addition of a helper) and MAINTAINERS (new driver edit overlapping revamp of PHY entry). Signed-off-by: David S. Miller <davem@davemloft.net>		2017-08-01 10:07:50 -07:00
..
core	RDMA/core: Initialize port_num in qp_attr	2017-07-20 11:24:13 -04:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-08-01 10:07:50 -07:00
sw	rxe: fix broken receive queue draining	2017-07-20 11:20:50 -04:00
ulp	RDMA/iser: don't send an rkey if all data is written as immadiate-data	2017-07-20 11:20:50 -04:00
Kconfig	IB/opa-vnic: Virtual Network Interface Controller (VNIC) netdev	2017-04-20 12:01:38 -04:00
Makefile	IB/rdmavt: Create module framework and handle driver registration	2016-03-10 20:37:04 -05:00