]> 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)
commit427d4fc103d92232effe029d4fd5737b785baca2
tree21313a44075b2906c0fb351598acfe4784a0dfe8
parent441c7ec92fb01740f2e29a8c62ed837bf3e58c48
parent82e1dc7664fa31f61c7686260a43e03350677f3a
parente90b65be0f450d4c8699766bea8fe59bfcc4ddf5
parentf252c716bc778d759138b180a0e86d749d35a12d
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