summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2010-03-12 10:54:20 -0800
committerRoland Dreier <rolandd@cisco.com>2010-03-12 10:54:20 -0800
commit0636b33c5f2fac4e274464ae6867805f080fc433 (patch)
tree6133eb384983b68b365237a6bfb95b9557f51dce /drivers/infiniband
parent69960a275efc9d82797bbbe2460a2d6c9cace314 (diff)
parenta48f509b26cec53338f4b0abd52ecea35e3974b8 (diff)
parent070e140c4c536df33a9870318791b2ca8f7dbfcf (diff)
parenta72042c08a8ba3b685dc9cba62c57c48188ef2c8 (diff)
Merge branches 'cxgb3', 'ipoib', 'misc' and 'nes' into for-next