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