From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Apr 2012 01:51:32 +0000 (-0700)
Subject: Merge tag 'srpt-srq-type' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v3.4-rc3~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4166fb64593514ad920b7dbd290e0a934b37d24a;p=thirdparty%2Flinux.git

Merge tag 'srpt-srq-type' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

Pull infiniband fix from Roland Dreier:
 "Add a fix for a bug hit by Alexey Shvetsov in ib_srtp that hits on
  non-mlx4 hardware."

* tag 'srpt-srq-type' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/srpt: Set srq_type to IB_SRQT_BASIC
---

4166fb64593514ad920b7dbd290e0a934b37d24a