From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 10 Feb 2015 15:04:01 +0000 (+0100)
Subject: Merge branches 'acpi-video' and 'acpi-soc'
X-Git-Tag: v4.0-rc1~143^2~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=99e4d89afc75d7bec31420c5aa2fba53e0411f95;p=linux.git

Merge branches 'acpi-video' and 'acpi-soc'

* acpi-video:
  ACPI / video: Add disable_native_backlight quirk for Samsung 510R
  ACPI / video: Add disable_native_backlight quirk for Samsung 730U3E/740U3E

* acpi-soc:
  ACPI: add AMD ACPI2Platform device support for x86 system
  ACPI / LPSS: Remove non-existing clock control from Intel Lynxpoint I2C
  ACPI / LPSS: check the result of ioremap()
---

99e4d89afc75d7bec31420c5aa2fba53e0411f95