From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Sun, 27 Nov 2016 00:52:26 +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~33
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=95598ba9179410183b406b47ff294ff1fc79165d;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:
  uek-rpm nano: Remove vmware modules from UEK Nano
  uek-rpm:enable ldmvsw module
---

95598ba9179410183b406b47ff294ff1fc79165d