Merge branch 'acpi-bus'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 18 Sep 2015 21:07:46 +0000 (23:07 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 18 Sep 2015 21:07:46 +0000 (23:07 +0200)
commit0f40314b81b765c26202cde33523e35809adbe9b
tree34cbbf71b39f88edddb8693f0a61427f305b17fa
parent7dc1d36e8ef8f78f9dadf0476081f3c7ff7f79be
parentbcb2b0b2bae2de744223c68521cd51c57feb486c
Merge branch 'acpi-bus'

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