From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 21 Feb 2014 00:27:48 +0000 (+0100)
Subject: Merge branches 'acpi-cleanup', 'acpi-dock', 'acpi-pci' and 'acpi-dsm'
X-Git-Tag: v4.9.8~6866^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=200df1cc88f95c7587c3eb3a3be6c826d6a6256a;p=platform%2Fkernel%2Flinux-rpi3.git

Merge branches 'acpi-cleanup', 'acpi-dock', 'acpi-pci' and 'acpi-dsm'

* acpi-cleanup:
  ACPI / SBS: Fix incorrect sscanf() string

* acpi-dock:
  ACPI / dock: Make 'docked' sysfs attribute work as documented

* acpi-pci:
  ACPI / PCI: Fix memory leak in acpi_pci_irq_enable()

* acpi-dsm:
  ACPI / nouveau: fix probing regression related to _DSM
---

200df1cc88f95c7587c3eb3a3be6c826d6a6256a