Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jun 2008 23:08:59 +0000 (16:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jun 2008 23:08:59 +0000 (16:08 -0700)
commitf9d1c6ca2bb1bbfde4a95d9e55ab3b0126825295
tree8d6d56189526b50041abaef8aa308d0e72aca91a
parenta8051fde6b71ac9a0e63c861c81c59ba776175f9
parentfb77bcef9f7be78e3e11543cb5abbcb1b1fac53e
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/uverbs: Fix check of is_closed flag check in ib_uverbs_async_handler()
  RDMA/nes: Fix off-by-one in nes_reg_user_mr() error path