[LinuxPPS] 10 May 02:40 - Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linuxpps: Linus Torvalds <>]

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/infiniband/Kconfig  
drivers/infiniband/Makefile  
drivers/infiniband/core/Makefile  
drivers/infiniband/core/device.c  
drivers/infiniband/core/umem.c  
drivers/infiniband/core/uverbs.h  
drivers/infiniband/core/uverbs_cmd.c  
drivers/infiniband/core/uverbs_main.c  
drivers/infiniband/core/uverbs_mem.c  
drivers/infiniband/hw/amso1100/c2_provider.c  
drivers/infiniband/hw/amso1100/c2_provider.h  
drivers/infiniband/hw/cxgb3/iwch_provider.c  
drivers/infiniband/hw/cxgb3/iwch_provider.h  
drivers/infiniband/hw/ehca/ehca_classes.h  
drivers/infiniband/hw/ehca/ehca_iverbs.h  
drivers/infiniband/hw/ehca/ehca_mrmw.c  
drivers/infiniband/hw/ipath/ipath_mr.c  
drivers/infiniband/hw/ipath/ipath_verbs.h  
drivers/infiniband/hw/mlx4/Kconfig  
drivers/infiniband/hw/mlx4/Makefile  
drivers/infiniband/hw/mlx4/ah.c  
drivers/infiniband/hw/mlx4/cq.c  
drivers/infiniband/hw/mlx4/doorbell.c  
drivers/infiniband/hw/mlx4/mad.c  
drivers/infiniband/hw/mlx4/main.c  
drivers/infiniband/hw/mlx4/mlx4_ib.h  
drivers/infiniband/hw/mlx4/mr.c  
drivers/infiniband/hw/mlx4/qp.c  
drivers/infiniband/hw/mlx4/srq.c  
drivers/infiniband/hw/mlx4/user.h  
drivers/infiniband/hw/mthca/mthca_provider.c  
drivers/infiniband/hw/mthca/mthca_provider.h  
drivers/net/Kconfig  
drivers/net/Makefile  
drivers/net/mlx4/Makefile  
drivers/net/mlx4/alloc.c  
drivers/net/mlx4/catas.c  
drivers/net/mlx4/cmd.c  
drivers/net/mlx4/cq.c  
drivers/net/mlx4/eq.c  
drivers/net/mlx4/fw.c  
drivers/net/mlx4/fw.h  
drivers/net/mlx4/icm.c  
drivers/net/mlx4/icm.h  
drivers/net/mlx4/intf.c  
drivers/net/mlx4/main.c  
drivers/net/mlx4/mcg.c  
drivers/net/mlx4/mlx4.h  
drivers/net/mlx4/mr.c  
drivers/net/mlx4/pd.c  
drivers/net/mlx4/profile.c  
drivers/net/mlx4/qp.c  
drivers/net/mlx4/reset.c  
drivers/net/mlx4/srq.c  
include/linux/mlx4/cmd.h  
include/linux/mlx4/cq.h  
include/linux/mlx4/device.h  
include/linux/mlx4/doorbell.h  
include/linux/mlx4/driver.h  
include/linux/mlx4/qp.h  
include/linux/mlx4/srq.h  
include/rdma/ib_umem.h  
include/rdma/ib_verbs.h

URL: http://gitweb.enneenne.com/?p=linuxpps;a=commit;h=de5603748af8bf7deac403e6ba92887f8d18e812