From: Rafael J. Wysocki Date: Fri, 11 May 2018 13:17:18 +0000 (+0200) Subject: Merge branches 'pm-pci' and 'pm-docs' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ef050374e1eedec45bd260e0ac9eb98f699267d2;p=linux.git Merge branches 'pm-pci' and 'pm-docs' * pm-pci: PCI / PM: Check device_may_wakeup() in pci_enable_wake() PCI / PM: Always check PME wakeup capability for runtime wakeup support * pm-docs: PM: docs: intel_pstate: fix Active Mode w/o HWP paragraph PM: docs: sleep-states: Fix a typo ("includig") --- ef050374e1eedec45bd260e0ac9eb98f699267d2