Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib'...
authorRoland Dreier <roland@purestorage.com>
Tue, 3 Sep 2013 16:01:08 +0000 (09:01 -0700)
committerRoland Dreier <roland@purestorage.com>
Tue, 3 Sep 2013 16:01:08 +0000 (09:01 -0700)
commit82af24ac6fc3f4910218419a0ca4f05d42b45c67
treec72594b29c5528145fd40d65b6f11060fe0f278d
parent09992579bc8cc03b1f90b815b75c3ba6621ef2f8
parent22878dbc9173a7f0322dd697b1b5b49a83a1d4d5
parent49b8e74438062aba379ce5d3f91b9e6e2e9c6745
parent2e02d653febff23de614dc8978c64fbaa2767d85
parent846be90d810c285f6474f53abf1f928e1113830e
parent33ccbd858f3a8676d976f1a990c7c62e51551241
parent0318f685213e04109d408ac04d8c0d11bb6b15f3
Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next
drivers/infiniband/core/uverbs.h
drivers/infiniband/core/uverbs_cmd.c
drivers/infiniband/core/verbs.c
include/rdma/ib_verbs.h