From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 11 Dec 2015 20:21:30 +0000 (-0800)
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~215
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=765d2bdf6cb074315a93045372ed75a5b9ecdd79;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:
  ib_core: Add udata argument to alloc_shpd()
---

765d2bdf6cb074315a93045372ed75a5b9ecdd79