Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 10 May 2007 02:40:09 +0000 (19:40 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 10 May 2007 02:40:09 +0000 (19:40 -0700)
commitde5603748af8bf7deac403e6ba92887f8d18e812
treefd93862c70ec0eeba5fe340d7519ab33a9cb1dff
parentb5f0adbcc4f16e378882d8f68fe3111df04911be
parent225c7b1feef1b41170f7037a5b10a65cd8a42c54
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
drivers/net/Kconfig
drivers/net/Makefile