summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-03-16 18:38:28 +0100
committerDoug Ledford <dledford@redhat.com>2016-03-16 18:38:28 +0100
commitd2ad9cc75963714d04d4596c226a499765950dbf (patch)
tree383b46ca4f4006dede169e9be20bb06eb98c052b /drivers/infiniband/hw/cxgb4/iw_cxgb4.h
parentMerge branches 'ib_core', 'ib_ipoib', 'srpt', 'drain-cq-v4' and 'net/9p' into... (diff)
parentIB/mlx5: Add support for don't trap rules (diff)
parentiser: Accept arbitrary sg lists mapping if the device supports it (diff)
parentIB/ocrdma: Skip using unneeded intermediate variable (diff)
downloadlinux-d2ad9cc75963714d04d4596c226a499765950dbf.tar.xz
linux-d2ad9cc75963714d04d4596c226a499765950dbf.zip
Merge branches 'mlx4', 'mlx5' and 'ocrdma' into k.o/for-4.6