From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Oct 2009 20:40:22 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v2.6.32-rc4~10
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bd381934bf13ccb1af2813ae26c6fe00ec85d254;p=~emulex%2Finfiniband.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:
  RDMA/addr: Fix resolution of local IPv6 addresses
  RDMA/cxgb3: Handle NULL inetdev pointer in iwch_query_port()
  mlx4_core: Add 40GigE device ID
  RDMA/iwcm: Don't call provider reject func with irqs disabled
  IB: Fix typo in udev rule documentation
---

bd381934bf13ccb1af2813ae26c6fe00ec85d254