Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jun 2008 02:28:54 +0000 (19:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jun 2008 02:28:54 +0000 (19:28 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/core: Remove IB_DEVICE_SEND_W_INV capability flag
  IB/umem: Avoid sign problems when demoting npages to integer


Trivial merge