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


Trivial merge