| commit | 200df1cc88f95c7587c3eb3a3be6c826d6a6256a | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Fri Feb 21 01:27:48 2014 +0100 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Fri Feb 21 01:27:48 2014 +0100 |
| tree | 21313a44075b2906c0fb351598acfe4784a0dfe8 | |
| parent | 32a90512055b300587cceead9127f41e311e01aa [diff] | |
| parent | ab62f9cd7b5ecdf853f1612fe1e983cb7cbbac3e [diff] | |
| parent | b685f3b1744061aa9ad822548ba9c674de5be7c6 [diff] | |
| parent | e284175a96e5af087ea7806b3e38282b524ff5b9 [diff] |
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