Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
commit165e4694dade7224f23785f9c3a89f3e9c3a9c14
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 8 Jan 2008 20:29:52 +0000 (8 12:29 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 8 Jan 2008 20:29:52 +0000 (8 12:29 -0800)
tree42162f0d45164e73c52a2db52b9157e2b7c0e454
parentd238998fbfa49f30b02f0a5de5294ca53c58348c
parentad696989b4a2fce8494964814376aef41da3ff55
Merge branch 'for-linus' of git://git./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