From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Thu, 9 Mar 2017 04:34:31 +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^0
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c50999d80976e57eed973d84e1b6ee1bdef22539;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:
  config: enable simple framebuffer driver for OL6
  fm10k: Add driver to the kernel config for UEK4
---

c50999d80976e57eed973d84e1b6ee1bdef22539