summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2010-03-12 19:54:20 +0100
committerRoland Dreier <rolandd@cisco.com>2010-03-12 19:54:20 +0100
commit0636b33c5f2fac4e274464ae6867805f080fc433 (patch)
tree6133eb384983b68b365237a6bfb95b9557f51dce /drivers/infiniband
parentRDMA/cxgb3: Wait at least one schedule cycle during device removal (diff)
parentIPoIB: Include return code in trace message for ib_post_send() failures (diff)
parentIB/mad: Ignore iWARP devices on device removal (diff)
parentRDMA/nes: Fix CX4 link problem in back-to-back configuration (diff)
downloadlinux-0636b33c5f2fac4e274464ae6867805f080fc433.tar.xz
linux-0636b33c5f2fac4e274464ae6867805f080fc433.zip
Merge branches 'cxgb3', 'ipoib', 'misc' and 'nes' into for-next