From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Sep 2015 16:16:20 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
X-Git-Tag: firefly_0821_release~176^2~1053
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=72714841b705a5b9bccf37ee85a62352bee3a3ef;p=firefly-linux-kernel-4.4.55.git

Merge tag 'for-linus' of git://git./linux/kernel/git/dledford/rdma

Pull rdma driver move from Doug Ledford:
 "This is a move only, no functional changes.

  I tried to get it in prior to the rc1 release, but we were waiting on
  IBM to get back to us that they were OK with the deprecation and
  eventual removal of this driver.  That OK didn't materialize until
  last week, so integration and testing time pushed us beyond the rc1
  release.

  Summary:

   - Move ehca driver to staging/rdma and schedule for deletion"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  IB/ehca: Deprecate driver, move to staging, schedule deletion
---

72714841b705a5b9bccf37ee85a62352bee3a3ef