From: Jens Axboe <axboe@fb.com>
Date: Tue, 15 Apr 2014 20:02:24 +0000 (-0600)
Subject: Merge tag 'v3.15-rc1' into for-3.16/core
X-Git-Tag: v3.16-rc3~16^2~7^2~71
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0;p=~emulex%2Finfiniband.git

Merge tag 'v3.15-rc1' into for-3.16/core

We don't like this, but things have diverged with the blk-mq fixes
in 3.15-rc1. So merge it in.
---

f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0