]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek into uek...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 17 Sep 2015 21:17:46 +0000 (14:17 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 17 Sep 2015 21:17:46 +0000 (14:17 -0700)
* '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


Trivial merge