]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branches 'acpi-pm' and 'pm-genirq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 23 Oct 2014 21:02:58 +0000 (23:02 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 23 Oct 2014 21:02:58 +0000 (23:02 +0200)
commit49fe0353689901b937ff21047a14d315bbbf78f3
treef5a3987c85aee7edfced76174b85dbbdd3c6e676
parent96ed753235c674a8cb261dac1a258cf6e50c6cd4
parent67598a1d3140a66f57aa6bcb8d22c4c2b7e910f5
parent5dfd7f9f88ba8539e630d04e17b93ccc7043c31c
Merge branches 'acpi-pm' and 'pm-genirq'

* acpi-pm:
  ACPI: invoke acpi_device_wakeup() with correct parameters

* pm-genirq:
  PCI / PM: handle failure to enable wakeup on PCIe PME
drivers/acpi/device_pm.c