Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma...
Roland Dreier [Mon, 21 May 2012 16:00:47 +0000 (09:00 -0700)]
1  2  3  4  5  6  7  8  9  10 
drivers/infiniband/core/uverbs_cmd.c
drivers/infiniband/core/verbs.c
drivers/infiniband/hw/mlx4/qp.c
include/rdma/ib_verbs.h

Simple merge
Simple merge
Simple merge
Simple merge