From: J. Bruce Fields <bfields@redhat.com>
Date: Thu, 11 Oct 2012 16:40:00 +0000 (-0400)
Subject: Merge Trond's bugfixes
X-Git-Tag: v3.7-rc1~24^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a9ca4043d074509b9d15003fbcb068d3cdae85a4;p=~emulex%2Finfiniband.git

Merge Trond's bugfixes

Merge branch 'bugfixes' of git://linux-nfs.org/~trondmy/nfs-2.6 into
for-3.7-incoming.  Mainly needed for Bryan's "SUNRPC: Set alloc_slot for
backchannel tcp ops", without which the 4.1 server oopses.
---

a9ca4043d074509b9d15003fbcb068d3cdae85a4