]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b506e6f 358e89b 4e3a6f7)
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)
commit542c9560311446d78686adf7e9022caa62f15c53
tree32849d70b7047b28c7d41aafde9fd8e9b523affctree | snapshot
parentb506e6f9af03741d87a3a9758f661bd9b139c324commit | diff
parent358e89bb57d318cb7a74e85ec839f91c2404e034commit | diff
parent4e3a6f711c03c77132d2d35b72eb858f2b4a1510commit | 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 Source Tree.