From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Mon, 17 Aug 2015 18:48:34 +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~301
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=40d2b358d1d75392fd02df8d1639e157fde6cea6;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: config: sync up the configs with 4.1.5 stable
  uek-rpm: config: Enable OVM API
  uek-rpm: config: enable some DRM options
---

40d2b358d1d75392fd02df8d1639e157fde6cea6