From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 21 Feb 2014 00:28:12 +0000 (+0100)
Subject: Merge branches 'acpi-pm' and 'acpi-video'
X-Git-Tag: v4.0~2344^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d8ad344cb445627687fb44769e2ed89f93d3f06b;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

d8ad344cb445627687fb44769e2ed89f93d3f06b