Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Sep 2015 16:16:20 +0000 (09:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Sep 2015 16:16:20 +0000 (09:16 -0700)
commit72714841b705a5b9bccf37ee85a62352bee3a3ef
tree9f6f07530326d00c5699590e0ea3be243ebc8fcd
parent30255100d7c253c82b596a0768235d5865eee2cf
parent447e9a4d27484175a84daaa8e03d35c650f443b7
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