From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 13 Nov 2015 19:29:36 +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~236
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3eda4c518611fe6518acededcff15e0359a2343f;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: Sparc64: enable RDS modules
  uek-rpm: ol7: update linux-firmware dependency to 20140911-0.1.git365e80c.0.4
  uek-rpm: configs: disable PS2_VMMOUSE to avoid vmware platform breakage
  uek-rpm: configs: ol7: don't set EFI_VARS_PSTORE_DEFAULT_DISABLE
---

3eda4c518611fe6518acededcff15e0359a2343f