summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2010-04-09 18:14:21 +0200
committerRoland Dreier <rolandd@cisco.com>2010-04-09 18:14:21 +0200
commit5091b353883ba3358998797efb284f82344531f3 (patch)
tree51c3a5240cc288a541c98186dd982569a07d4c60
parentRDMA/cm: Set num_paths when manually assigning path records (diff)
parentIB/cm: Fix device_create() return value check (diff)
parentIB/mlx4: Check correct variable for allocation failure (diff)
parentRDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp() (diff)
downloadlinux-5091b353883ba3358998797efb284f82344531f3.tar.xz
linux-5091b353883ba3358998797efb284f82344531f3.zip
Merge branches 'cma', 'misc', 'mlx4' and 'nes' into for-linus