From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Thu, 17 Sep 2015 21:17:46 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-92~277
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ec4f23ad240375bc1d74363532c881972ef3154a;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek:
  RDS: change spin_lock to spin_lock_bh
  rds: add busy_list only when fmr allocated successfully
  rds: free ib_device related resource
  rds: srq initialization and cleanup
---

ec4f23ad240375bc1d74363532c881972ef3154a