David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
core	RDMA/SA: Fix kernel panic in CMA request handler flow	2017-06-01 17:20:14 -04:00
hw	qed*: LL2 callback operations	2017-06-09 15:49:02 -04:00
sw	crypto: Work around deallocated stack frame reference gcc bug on sparc.	2017-06-08 17:36:03 +08:00
ulp	RDMA/SA: Fix kernel panic in CMA request handler flow	2017-06-01 17:20:14 -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