diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-13 03:32:25 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-13 03:32:25 +0300 |
commit | 040e8a4a4c045b59dd9235eae0643af19edb3942 (patch) | |
tree | e3e2ffcab0e9ac8ad69324a240723be595b21e18 /include/linux/nmi.h | |
parent | e029b9bf1221f200319541cd6861912b89345665 (diff) | |
parent | ca67ab5c5afbcec9df199e01838270eb5668af68 (diff) | |
parent | e200052f826295ea606039d15fa518c401d64b56 (diff) | |
parent | 7e95d9134e3851de57075254737bc434462bb293 (diff) | |
download | linux-040e8a4a4c045b59dd9235eae0643af19edb3942.tar.xz |
Merge branches 'pm-pci', 'pm-avs' and 'pm-docs'
* pm-pci:
PCI / PM: Add dev_dbg() to print device suspend power states
PCI / PM: Do not resume any devices in pci_pm_prepare()
* pm-avs:
PM / AVS: Use %pS printk format for direct addresses
* pm-docs:
PM: docs: Fix formatting typo in devices.rst