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

diff --combined drivers/net/Kconfig
index d9842d8,6db12d0..fa489b1
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -2493,14 -2493,26 +2493,28 @@@ config PASEMI_MA
          This driver supports the on-chip 1/10Gbit Ethernet controller on
          PA Semi's PWRficient line of chips.
  
+ config MLX4_CORE
+       tristate
+       depends on PCI
+       default n
+ 
+ config MLX4_DEBUG
+       bool "Verbose debugging output" if (MLX4_CORE && EMBEDDED)
+       default y
+       ---help---
+         This option causes debugging code to be compiled into the
+         mlx4_core driver.  The output can be turned on via the
+         debug_level module parameter (which can also be set after
+         the driver is loaded through sysfs).
+ 
  endmenu
  
  source "drivers/net/tokenring/Kconfig"
  
  source "drivers/net/wireless/Kconfig"
  
 +source "drivers/net/usb/Kconfig"
 +
  source "drivers/net/pcmcia/Kconfig"
  
  source "drivers/net/wan/Kconfig"

diff --combined drivers/net/Makefile
index c5d8423,7faeeea..a77affa
--- 1/drivers/net/Makefile
--- 2/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -197,6 -197,7 +197,7 @@@ obj-$(CONFIG_SMC911X) += smc911x.
  obj-$(CONFIG_DM9000) += dm9000.o
  obj-$(CONFIG_FEC_8XX) += fec_8xx/
  obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
+ obj-$(CONFIG_MLX4_CORE) += mlx4/
  
  obj-$(CONFIG_MACB) += macb.o
  
@@@ -206,14 -207,6 +207,14 @@@ obj-$(CONFIG_TR) += tokenring
  obj-$(CONFIG_WAN) += wan/
  obj-$(CONFIG_ARCNET) += arcnet/
  obj-$(CONFIG_NET_PCMCIA) += pcmcia/
 +
 +obj-$(CONFIG_USB_CATC)          += usb/
 +obj-$(CONFIG_USB_KAWETH)        += usb/
 +obj-$(CONFIG_USB_PEGASUS)       += usb/
 +obj-$(CONFIG_USB_RTL8150)       += usb/
 +obj-$(CONFIG_USB_USBNET)        += usb/
 +obj-$(CONFIG_USB_ZD1201)        += usb/
 +
  obj-y += wireless/
  obj-$(CONFIG_NET_TULIP) += tulip/
  obj-$(CONFIG_HAMRADIO) += hamradio/