From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 20 Nov 2015 02:03:03 +0000 (-0800)
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~232
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7ee18777667df3c29cd06b242c263b2931acf6b9;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: change the x86_64 default governor to ondemand
  uek-rpm: configs: sync up the EFIVAR_FS between ol6 and ol7
  uek-rpm: use the latest 0.5 version of linux-firmware
---

7ee18777667df3c29cd06b242c263b2931acf6b9