commit | de5603748af8bf7deac403e6ba92887f8d18e812 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed May 09 19:40:09 2007 -0700 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed May 09 19:40:09 2007 -0700 |
tree | fd93862c70ec0eeba5fe340d7519ab33a9cb1dff | |
parent | b5f0adbcc4f16e378882d8f68fe3111df04911be [diff] | |
parent | 225c7b1feef1b41170f7037a5b10a65cd8a42c54 [diff] |
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