From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Mon, 6 Jul 2015 20:20:38 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/rpm-build' into topic/uek-4.1/ofed
X-Git-Tag: v4.1.12-92~319^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e5e0c52ab0b1b1496cac1e7d92af1ab575eeba56;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/rpm-build' into topic/uek-4.1/ofed

* topic/uek-4.1/rpm-build:
  uek-rpm: configs: Enabel Oracle HXGE and ASM driver
  uek-rpm: build: Add rpm build environment for ol6/ol7
  uek-rpm: configs: Create baseline config for uek4[ol6/ol7]
---

e5e0c52ab0b1b1496cac1e7d92af1ab575eeba56