Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and...
authorRoland Dreier <roland@purestorage.com>
Mon, 23 Jul 2012 06:26:17 +0000 (23:26 -0700)
committerRoland Dreier <roland@purestorage.com>
Mon, 23 Jul 2012 06:26:17 +0000 (23:26 -0700)
commit089117e1ad265625b523a4168f77f2521b18fd32
tree4881dc29221447bc889eab14b53dfceb4632309a
parent68602120e496a31d8e3b36d0bfc7d9d2456fb05c
parentf747c34af4f56cc239e04505bd583dd3bdcfe49d
parentd90f9b3591b3b5fa86178e318008fc1c531a84dc
parent6634961c14d38ef64ec284c07aecb03d3dd03b4a
parent240a9207aae24916dba7070aa7047c3732102cb8
parentd1e09ebf426ff34b4b6bbd6212b820edeb992bd4
parent7fac33014f54c26bb1b1b4282b27c7988116d639
Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and 'qib' into for-linus
drivers/infiniband/core/cma.c
drivers/infiniband/hw/mlx4/main.c