From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 10 May 2007 02:40:09 +0000 (-0700)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
X-Git-Tag: v2.6.22-rc1~130
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=de5603748af8bf7deac403e6ba92887f8d18e812;p=powerpc.git

Merge branch 'for-linus' of /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
---

de5603748af8bf7deac403e6ba92887f8d18e812