From: Rafael J. Wysocki Date: Fri, 18 Sep 2015 21:07:46 +0000 (+0200) Subject: Merge branch 'acpi-bus' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0f40314b81b765c26202cde33523e35809adbe9b;p=linux.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