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: firefly_0821_release~176^2~1030^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=0f40314b81b765c26202cde33523e35809adbe9b

Merge branch 'acpi-bus'

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

0f40314b81b765c26202cde33523e35809adbe9b