diff options
author | Roland Dreier <rolandd@cisco.com> | 2010-03-12 19:54:20 +0100 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2010-03-12 19:54:20 +0100 |
commit | 0636b33c5f2fac4e274464ae6867805f080fc433 (patch) | |
tree | 6133eb384983b68b365237a6bfb95b9557f51dce /drivers/infiniband | |
parent | RDMA/cxgb3: Wait at least one schedule cycle during device removal (diff) | |
parent | IPoIB: Include return code in trace message for ib_post_send() failures (diff) | |
parent | IB/mad: Ignore iWARP devices on device removal (diff) | |
parent | RDMA/nes: Fix CX4 link problem in back-to-back configuration (diff) | |
download | linux-0636b33c5f2fac4e274464ae6867805f080fc433.tar.xz linux-0636b33c5f2fac4e274464ae6867805f080fc433.zip |
Merge branches 'cxgb3', 'ipoib', 'misc' and 'nes' into for-next