]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 200df1c fae9e2a a694019)
Merge branches 'acpi-pm' and 'acpi-video'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Feb 2014 00:28:12 +0000 (01:28 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Feb 2014 00:28:12 +0000 (01:28 +0100)
commitd8ad344cb445627687fb44769e2ed89f93d3f06b
tree32849d70b7047b28c7d41aafde9fd8e9b523affctree | snapshot
parent200df1cc88f95c7587c3eb3a3be6c826d6a6256acommit | diff
parentfae9e2a4b1c59d11edfa7c99c34293bf9fbf2bdecommit | diff
parenta6940190ac15c361862a1a8f50a2072db7184749commit | diff
Merge branches 'acpi-pm' and 'acpi-video'

* acpi-pm:
  ACPI / thermal: fix thermal driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / SBS: fix SBS driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / fan: fix fan driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / button: fix button driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / battery: fix battery driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / AC: fix AC driver compile error when CONFIG_PM_SLEEP is undefined

* acpi-video:
  Revert "ACPI: Blacklist Win8 OSI for some HP laptop 2013 models"
  ACPI / video: Add systems that should favour native backlight interface
  ACPI / video: Filter the _BCL table for duplicate brightness values
drivers/acpi/sbs.c diff1 | diff2 | diff3 | blob | history
Linux kernel for KaRo TX COM modules