tree a02a03a4c75e3da0843168456124f60afae49200
parent 6a1214113090905aca6a492fc8ef10d84c608a69
parent b0f43dcca8a1f46e17b26d10f3cb1b297ebfb44e
author Linus Torvalds <torvalds@linux-foundation.org> 1228158114 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228158114 -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:
  IB/mlx4: Fix MTT leakage in resize CQ
  IB/ehca: Fix problem with generated flush work completions
  IB/ehca: Change misleading error message on memory hotplug
  mlx4_core: Save/restore default port IB capability mask