Merge branches 'acpi-cleanup', 'acpi-dock', 'acpi-pci' and 'acpi-dsm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Feb 2014 00:27:48 +0000 (01:27 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Feb 2014 00:27:48 +0000 (01:27 +0100)
commit200df1cc88f95c7587c3eb3a3be6c826d6a6256a
tree21313a44075b2906c0fb351598acfe4784a0dfe8
parent32a90512055b300587cceead9127f41e311e01aa
parentab62f9cd7b5ecdf853f1612fe1e983cb7cbbac3e
parentb685f3b1744061aa9ad822548ba9c674de5be7c6
parente284175a96e5af087ea7806b3e38282b524ff5b9
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