From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Apr 2008 02:18:43 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v2.6.26-rc1~1110
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=807501475fce0ebe68baedf87f202c3e4ee0d12c;p=linux-2.6

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ipath: Correct capitalization "IntX" -> "INTx"
  IB/ipath: Remove tests of PCI_MSI in ipath_iba7220.c
  IB/ipath: Remove dependency on PCI_MSI || HT_IRQ
  IB/ipath: Build IBA7220 code unconditionally
  IB/ipath: Remove reference to dev->class_dev
  IB/ipath: Fix module parameter description for disable_sma
  RDMA/nes: Remove unneeded function declarations

Fix up conflict in drivers/infiniband/hw/ipath/ipath_verbs.c (by picking
the solution from the infiniband branch)
---

807501475fce0ebe68baedf87f202c3e4ee0d12c