projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7dc1d36 bcb2b0b)
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)
* acpi-bus:
  ACPI: Eliminate CONFIG_.*{, _MODULE} #ifdef in favor of IS_ENABLED()
  ACPI: int340x_thermal: add missing CONFIG_ prefix


Trivial merge
John Crispins staging tree