David S. Miller 5510b3c2a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/s390/net/bpf_jit_comp.c drivers/net/ethernet/ti/netcp_ethss.c net/bridge/br_multicast.c net/ipv4/ip_fragment.c All four conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-07-31 23:52:20 -07:00
..
amso1100	IB/mad: Add support for additional MAD info to/from drivers	2015-06-12 14:49:17 -04:00
cxgb3	RDMA/cxgb3: fail get_dma_mr on 64 bit arches	2015-07-24 11:34:17 -04:00
cxgb4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-06-24 16:49:49 -07:00
ehca	IB/mad: Remove improper use of BUG_ON	2015-07-14 13:20:08 -04:00
ipath	x86/mm/pat, drivers/infiniband/ipath: Replace WARN() with pr_warn()	2015-07-21 09:42:54 +02:00
mlx4	net/mlx4: Prepare VLAN macros for 802.1ad Hardware accelerated support	2015-07-27 15:00:37 -07:00
mlx5	IB/mad: Remove improper use of BUG_ON	2015-07-14 13:20:08 -04:00
mthca	IB/mad: Remove improper use of BUG_ON	2015-07-14 13:20:08 -04:00
nes	RDMA/nes: Fix for incorrect recording of the MAC address	2015-07-14 13:20:11 -04:00
ocrdma	RDMA/ocrdma: update ocrdma module license string	2015-07-24 11:34:41 -04:00
qib	IB/mad: Remove improper use of BUG_ON	2015-07-14 13:20:08 -04:00
usnic	IB/core: Pass hardware specific data in query_device	2015-06-12 14:49:10 -04:00
Makefile	IB: Allow build of hw/ and ulp/ subdirectories independently	2014-06-02 14:51:12 -07:00