Merge branches 'cma', 'cxgb4', 'iser', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', ...
authorRoland Dreier <roland@purestorage.com>
Fri, 14 Feb 2014 17:49:12 +0000 (09:49 -0800)
committerRoland Dreier <roland@purestorage.com>
Fri, 14 Feb 2014 17:49:12 +0000 (09:49 -0800)
1  2  3  4  5  6  7  8  9  10 
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c

Simple merge