tree 106edaeff4cac9d1a402eaa33863422248bf68cc
parent a052f4473603765eb6b4c19754689977601dc1d1
parent e383d19e90cfbbf8e00512d44194ce175b3f60a2
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1195095229 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1195095229 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  mlx4_core: Fix thinko in QP destroy (incorrect bitmap_free)
  RDMA/cxgb3: Set the max_qp_init_rd_atom attribute in query_device
  IB/ehca: Fix static rate calculation
  IB/ehca: Return physical link information in query_port()
  IB/ipath: Fix race with ACK retry timeout list management
  IB/ipath: Fix memory leak in ipath_resize_cq() if copy_to_user() fails
  mlx4_core: Fix possible bad free in mlx4_buf_free()