diff options
| author |   Roland Dreier <roland@purestorage.com> | 2012-11-26 11:08:41 -0800 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2012-11-26 11:08:41 -0800 |
| commit | d0951d2133f260e216dbaa8dadcc73d3d5237809 (patch) | |
| tree | 61ba33774509bc038610d7a63acb049c898971d6 /drivers/infiniband | |
| parent | RDMA/cxgb4: use WARN (diff) | |
| parent | RDMA/cxgb3: use WARN (diff) | |
| parent | mlx4: 64-byte CQE/EQE support (diff) | |
| parent | RDMA/nes: Use WARN() (diff) | |
| parent | UAPI: (Scripted) Disintegrate include/rdma (diff) | |
| download | linux-dev-d0951d2133f260e216dbaa8dadcc73d3d5237809.tar.xz linux-dev-d0951d2133f260e216dbaa8dadcc73d3d5237809.zip | |
Merge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'uapi' into for-next