fa49f30b02f0a5de5294ca53c58348c
parent ad696989b4a2fce8494964814376aef41da3ff55
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1199824192 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1199824192 -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/srp: Release transport before removing host
  IB/mlx4: Fix value of pkey_index in QP1 completions
  MAINTAINERS: Update Sean Hefty's email address
ó-Ï'™(x