]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb506e6f9af03741d87a3a9758f661bd9b139c324
tree21313a44075b2906c0fb351598acfe4784a0dfe8
parent7c8a5206eeb8654217c6602ef57d24bba8b93935
parentf31209acd5f28d06b4cf322b2f3f6bf46f3f29ee
parent2a72644482506dfebf0ee6612cd5e6801159d16a
parent9306556d5cf1cb2a453fa306eb64196b26a7b2fc
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