]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitca74e0d5b2e2b4b23fe4b65f9baf571f0cb8ad2c
tree34cbbf71b39f88edddb8693f0a61427f305b17fa
parente22fd59a7c5cfc4a41124d10612151474e06e9c4
parente213b890b21cfe0b0b6c3b0ac9bc3b5d821a4253
Merge branch 'acpi-bus'

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