From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Mar 2011 14:59:46 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v2.6.39-rc1~95
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0625bef6060fab4aab0e484130b59af5e9ac81bc;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB: Increase DMA max_segment_size on Mellanox hardware
  IB/mad: Improve an error message so error code is included
  RDMA/nes: Don't print success message at level KERN_ERR
  RDMA/addr: Fix return of uninitialized ret value
  IB/srp: try to use larger FMR sizes to cover our mappings
  IB/srp: add support for indirect tables that don't fit in SRP_CMD
  IB/srp: rework mapping engine to use multiple FMR entries
  IB/srp: allow sg_tablesize to be set for each target
  IB/srp: move IB CM setup completion into its own function
  IB/srp: always avoid non-zero offsets into an FMR
---

0625bef6060fab4aab0e484130b59af5e9ac81bc