diff options
author | Roland Dreier <roland@purestorage.com> | 2012-11-29 21:16:43 +0100 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2012-11-29 21:16:43 +0100 |
commit | 78c90247afb786b1a1fbfffbcd42907ce480e36f (patch) | |
tree | 62d7c002f0ca8a7b8208451dcb99390bd31eeb0d /drivers/infiniband | |
parent | Merge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'uapi' into for-next (diff) | |
parent | RDMA/cm: Change return value from find_gid_port() (diff) | |
parent | mlx4_core: Fix potential deadlock in mlx4_eq_int() (diff) | |
download | linux-78c90247afb786b1a1fbfffbcd42907ce480e36f.tar.xz linux-78c90247afb786b1a1fbfffbcd42907ce480e36f.zip |
Merge branches 'cma' and 'mlx4' into for-next