tree 8d6d56189526b50041abaef8aa308d0e72aca91a
parent a8051fde6b71ac9a0e63c861c81c59ba776175f9
parent fb77bcef9f7be78e3e11543cb5abbcb1b1fac53e
author Linus Torvalds <torvalds@linux-foundation.org> 1213830539 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1213830539 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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