From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 30 May 2010 16:12:16 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v2.6.35-rc1~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3e9345edd8562dc4f9bbca88a598c91c8779a9c4;p=~shefty%2Frdma-dev.git

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/qib: Remove DCA support until feature is finished
  IB/qib: Use a single txselect module parameter for serdes tuning
  IB/qib: Don't rely on (undefined) order of function parameter evaluation
  IB/ucm: Use memdup_user()
  IB/qib: Fix undefined symbol error when CONFIG_PCI_MSI=n
---

3e9345edd8562dc4f9bbca88a598c91c8779a9c4