From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Thu, 16 Jul 2015 18:39:11 +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~319
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cd07ef309939129812213cf6a13df58ae59a6bce;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
---

cd07ef309939129812213cf6a13df58ae59a6bce