David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/geneve.c Here we had an overlapping change, where in 'net' the extraneous stats bump was being removed whilst in 'net-next' the final argument to udp_tunnel6_xmit_skb() was being changed. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-17 22:08:28 -05:00
..
cxgb3	RDMA/cxgb3: Remove old FRWR API	2015-10-28 22:27:19 -04:00
cxgb4	iw_cxgb4: Remove old FRWR API	2015-10-28 22:32:29 -04:00
mlx4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-17 22:08:28 -05:00
mlx5	IB/mlx5: Postpone remove_keys under knowledge of coming preemption	2015-12-08 16:55:31 -05:00
mthca	Merge branch 'wr-cleanup' into k.o/for-4.4	2015-10-28 22:23:34 -04:00
nes	Initial 4.4 merge window submission	2015-11-07 13:33:07 -08:00
ocrdma	RDMA/ocrdma: Remove old FRWR API	2015-10-28 22:27:19 -04:00
qib	IB/qib: Minor fixes to qib per SFF 8636	2015-12-07 16:36:00 -05:00
usnic	usnic: correctly handle kzalloc return value	2015-10-21 16:41:19 -04:00
Makefile	IB/ehca: Deprecate driver, move to staging, schedule deletion	2015-09-11 18:13:35 -04:00