diff options
| author |   Roland Dreier <rolandd@cisco.com> | 2009-09-10 21:19:45 -0700 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2009-09-10 21:19:45 -0700 |
| commit | 73f526da0260db5376951373c267596993dc13a8 (patch) | |
| tree | 9d84938e61970fcd56830009911e9b39b7eee478 /drivers/infiniband/hw/mthca/mthca_provider.c | |
| parent | Merge branches 'cxgb3', 'ehca', 'ipath', 'ipoib', 'misc', 'mlx4', 'mthca' and 'nes' into for-linus (diff) | |
| parent | IB/mad: Allow tuning of QP0 and QP1 sizes (diff) | |
| download | linux-dev-73f526da0260db5376951373c267596993dc13a8.tar.xz linux-dev-73f526da0260db5376951373c267596993dc13a8.zip | |
Merge branch 'mad' into for-linus
Conflicts:
drivers/infiniband/core/mad.c
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_provider.c')
0 files changed, 0 insertions, 0 deletions