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	d48157a6626739461a851420008bc250a15a3af9
tree	f5a3987c85aee7edfced76174b85dbbdd3c6e676	tree \| snapshot
parent	1be36006a2aa0fb3c6c0f080ae2621e70f431ac7	commit \| diff
parent	d062fd4a85647fc555587eb26bf773e53dc6c429	commit \| diff
parent	7b1caa4bbfc3927be0b8732c76a68aa62beb514a	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