Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 3 Jan 2008 20:07:49 +0000 (12:07 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 3 Jan 2008 20:07:49 +0000 (12:07 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/srp: Fix list corruption/oops on module reload


Trivial merge