mirror_ubuntu-kernels/drivers/infiniband/hw/mlx5
David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/mediatek/mtk_eth_soc.c
	drivers/net/ethernet/qlogic/qed/qed_dcbx.c
	drivers/net/phy/Kconfig

All conflicts were cases of overlapping commits.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-09-12 15:52:44 -07:00
..
ah.c
cq.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
doorbell.c
gsi.c IB/mlx5: Fix iteration overrun in GSI qps 2016-08-02 14:32:51 -04:00
ib_virt.c
Kconfig
mad.c
main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
Makefile
mem.c IB/mlx5: Fix the size parameter to find_first_bit 2016-09-02 13:46:12 -04:00
mlx5_ib.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
mr.c {net,IB}/mlx5: MKey/PSV commands via mlx5 ifc 2016-08-14 14:39:18 +03:00
odp.c
qp.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
srq.c {net, IB}/mlx5: Refactor internal SRQ API 2016-06-23 11:20:07 -04:00
user.h