Merge branches 'cxgb4-2', 'i40iw-2', 'ipoib', 'misc-4.7' and 'mlx5-fcs' into k.o...
authorDoug Ledford <dledford@redhat.com>
Fri, 13 May 2016 23:40:38 +0000 (19:40 -0400)
committerDoug Ledford <dledford@redhat.com>
Fri, 13 May 2016 23:40:38 +0000 (19:40 -0400)
commit0651ec932afffce6547efb3e0352e5d229273962
treefef07f57e5900c28f6952299fc2fe3a3910ff1a9
parente9bb8af98a981fe404010706a192ca0450a87760
parentba987e51a63713669ce6bdbe9b120d72e59eec8e
parent78c49f83ee282dd08fd264fecb90f4f9e2f21a6d
parente3614bc9dc448c3395adf311098dfc64abcc5a35
parent37aa5c36aa70c9fc5f633b89cce990f04aaa3cd4
parentcff5a0f3a3cda0d852425093f92acca169eb5aea
Merge branches 'cxgb4-2', 'i40iw-2', 'ipoib', 'misc-4.7' and 'mlx5-fcs' into k.o/for-4.7
drivers/infiniband/core/cma.c
drivers/infiniband/hw/cxgb4/iw_cxgb4.h
drivers/infiniband/hw/cxgb4/mem.c
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/mlx5_ib.h
drivers/infiniband/hw/nes/nes_verbs.c
drivers/infiniband/ulp/srp/ib_srp.c
include/rdma/ib_verbs.h