From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 18 Sep 2015 21:07:46 +0000 (+0200)
Subject: Merge branch 'acpi-bus'
X-Git-Tag: v4.3-rc2~3^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0f40314b81b765c26202cde33523e35809adbe9b;p=users%2Fwilly%2Flinux.git

Merge branch 'acpi-bus'

* acpi-bus:
  ACPI: Eliminate CONFIG_.*{, _MODULE} #ifdef in favor of IS_ENABLED()
  ACPI: int340x_thermal: add missing CONFIG_ prefix
---

0f40314b81b765c26202cde33523e35809adbe9b