diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-21 01:27:48 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-21 01:27:48 +0100 |
commit | 200df1cc88f95c7587c3eb3a3be6c826d6a6256a (patch) | |
tree | 21313a44075b2906c0fb351598acfe4784a0dfe8 /drivers/acpi | |
parent | ACPI / SBS: Fix incorrect sscanf() string (diff) | |
parent | ACPI / dock: Make 'docked' sysfs attribute work as documented (diff) | |
parent | ACPI / PCI: Fix memory leak in acpi_pci_irq_enable() (diff) | |
parent | ACPI / nouveau: fix probing regression related to _DSM (diff) | |
download | linux-200df1cc88f95c7587c3eb3a3be6c826d6a6256a.tar.xz linux-200df1cc88f95c7587c3eb3a3be6c826d6a6256a.zip |
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