tree fd93862c70ec0eeba5fe340d7519ab33a9cb1dff
parent b5f0adbcc4f16e378882d8f68fe3111df04911be
parent 225c7b1feef1b41170f7037a5b10a65cd8a42c54
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1178764809 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1178764809 -0700

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mlx4: Add a driver Mellanox ConnectX InfiniBand adapters
  IB: Put rlimit accounting struct in struct ib_umem
  IB/uverbs: Export ib_umem_get()/ib_umem_release() to modules