From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Fri, 20 Jan 2017 10:12:44 +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~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=70e792b74c887f78a0fb3bbac374e53d4d4a263c;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:
  perf: build TUI by default by pulling in slang and linking it statically
  configs: ol6: set with_headers, with_dtrace defaults to 0
  smartpqi: enable driver in uek config files
  Add the CONFIG_DEBUG_SET_MODULE_RONX option to OL6
---

70e792b74c887f78a0fb3bbac374e53d4d4a263c