git.baikalelectronics.ru Git - kernel.git/commit

author	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Thu, 23 Oct 2014 21:02:58 +0000 (23:02 +0200)
committer	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Thu, 23 Oct 2014 21:02:58 +0000 (23:02 +0200)
commit	136ef3ba75703ba6863ef0ea973e9df9b6ad3456
tree	f5a3987c85aee7edfced76174b85dbbdd3c6e676	tree \| snapshot
parent	226f9dde9df697def1de2eb3245747d404900dd8	commit \| diff
parent	19b9a5be92c21487e901c943e3157bdfe3c7abae	commit \| diff
parent	47439d962ad459bb94858f53bb5010d13c53cd5b	commit \| diff

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