From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Thu, 9 Mar 2017 07:39:22 +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-93^0
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=783eca32ef0f7de67c270f7d2ac19ead8ef759e8;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-config: enable CONFIG_MOUSE_PS2_VMMOUSE
  uek-rpm: enable CONFIG_KSPLICE.
---

783eca32ef0f7de67c270f7d2ac19ead8ef759e8