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/ipath: kbuild infrastructure
  IB/ipath: infiniband verbs support
  IB/ipath: misc infiniband code, part 2
  IB/ipath: misc infiniband code, part 1
  IB/ipath: infiniband RC protocol support
  IB/ipath: infiniband UC and UD protocol support
  IB/ipath: infiniband header files
  IB/ipath: layering interfaces used by higher-level driver code
  IB/ipath: support for userspace apps using core driver
  IB/ipath: sysfs and ipathfs support for core driver
  IB/ipath: misc driver support code
  IB/ipath: chip initialisation code, and diag support
  IB/ipath: support for PCI Express devices
  IB/ipath: support for HyperTransport devices
  IB/ipath: core driver header files
  IB/ipath: core device driver

diff --cc drivers/Makefile
index 55205c8d23184bb0cdea144083c16fa769b67dcb,2449ec55ca28c806876e6c1a3bd0e49246b173d6..447d8e68887a1f668312806e8cedd75c8c218247
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -67,8 -69,8 +67,9 @@@ obj-$(CONFIG_MCA)             += mca
  obj-$(CONFIG_EISA)            += eisa/
  obj-$(CONFIG_CPU_FREQ)                += cpufreq/
  obj-$(CONFIG_MMC)             += mmc/
 +obj-$(CONFIG_NEW_LEDS)                += leds/
  obj-$(CONFIG_INFINIBAND)      += infiniband/
+ obj-$(CONFIG_IPATH_CORE)      += infiniband/
  obj-$(CONFIG_SGI_SN)          += sn/
  obj-y                         += firmware/
  obj-$(CONFIG_CRYPTO)          += crypto/