From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Sat, 11 Jun 2016 00:46:52 +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~138
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=54be9ac1d9af87378dc2b391f73926edafe91c32;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
---

54be9ac1d9af87378dc2b391f73926edafe91c32