aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-11-29 12:16:43 -0800
committerRoland Dreier <roland@purestorage.com>2012-11-29 12:16:43 -0800
commit78c90247afb786b1a1fbfffbcd42907ce480e36f (patch)
tree62d7c002f0ca8a7b8208451dcb99390bd31eeb0d /drivers/infiniband
parentMerge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'uapi' into for-next (diff)
parentRDMA/cm: Change return value from find_gid_port() (diff)
parentmlx4_core: Fix potential deadlock in mlx4_eq_int() (diff)
downloadlinux-dev-78c90247afb786b1a1fbfffbcd42907ce480e36f.tar.xz
linux-dev-78c90247afb786b1a1fbfffbcd42907ce480e36f.zip
Merge branches 'cma' and 'mlx4' into for-next