Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma...
authorRoland Dreier <roland@purestorage.com>
Mon, 21 May 2012 16:00:47 +0000 (09:00 -0700)
committerRoland Dreier <roland@purestorage.com>
Mon, 21 May 2012 16:00:47 +0000 (09:00 -0700)
commitcc169165c82e14ea43e313f937a0a475ca97e588
tree519721cccd2d91ecba43ef4f8879021c8858d8b7
parent02daaf2741e74758a119768ca80cdf71c994ebd3
parente572568fbcc680e5bfce1819bbb4805ca218b5d0
parent464357a7591302a98a5dbede7515c72adf4f2fef
parent7d9c0de4ab4ec00b8349d1af0b736a0d473671c2
parentb6cec8aa4a799d1e146095f0ba52454710f5ede4
parent035b1032b57635e0b6015aed47dcb43c01e4ce7f
parent784d135f967849cb51c7e8d0c5230734f893331c
parent349556692df946b9cd5b84f2b0fa09b98732e986
parent1c94283ddbe8a9945c4aaac8b0be90d47f97f2df
parent3987a2d3193cf267cb852f48b2b299c9574644c3
Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma', 'qib' and 'raw-qp' into for-linus
drivers/infiniband/core/uverbs_cmd.c
drivers/infiniband/core/verbs.c
drivers/infiniband/hw/mlx4/qp.c
include/rdma/ib_verbs.h