From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Thu, 16 Jul 2015 18:06:23 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/rpm-build' of git://ca-git.us.oracle.com/linux-uek into... 
X-Git-Tag: v4.1.12-92~321
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=787a81c72963a7c6d1f2a3308c3c2b89960a3c84;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/rpm-build' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* 'topic/uek-4.1/rpm-build' of git://ca-git.us.oracle.com/linux-uek:
  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]
---

787a81c72963a7c6d1f2a3308c3c2b89960a3c84