aboutsummaryrefslogtreecommitdiff
path: root/net/unix
diff options
context:
space:
mode:
authorRafael J. Wysocki2020-12-15 15:26:14 +0100
committerRafael J. Wysocki2020-12-15 15:26:14 +0100
commit42b4ca04cbfde952e7be132ffc7226890323bbe1 (patch)
treecc7c508d1c6abb404e703e82a5266caa78f6b547 /net/unix
parent4c5744a0c4fcb878e1500e77d53722197c0a3f7c (diff)
parent4e1d9a737d00f2cc811dc5654f82c92c7d80e98c (diff)
parentb93b7ef61764819b6060f69e35ea9d6563b9b5d8 (diff)
parent718072ceb211833f3c71724f49d733d636067191 (diff)
parentb4ba76fb1c999384c1b0840d216d42abcd611024 (diff)
Merge branches 'pm-sleep', 'pm-acpi', 'pm-domains' and 'powercap'
* pm-sleep: PM: sleep: Add dev_wakeup_path() helper PM / suspend: fix kernel-doc markup PM: sleep: Print driver flags for all devices during suspend/resume * pm-acpi: PM: ACPI: Refresh wakeup device power configuration every time PM: ACPI: PCI: Drop acpi_pm_set_bridge_wakeup() PM: ACPI: reboot: Use S5 for reboot * pm-domains: PM: domains: create debugfs nodes when adding power domains PM: domains: replace -ENOTSUPP with -EOPNOTSUPP * powercap: powercap: Adjust printing the constraint name with new line powercap: RAPL: Add AMD Fam19h RAPL support powercap: Add AMD Fam17h RAPL support powercap/intel_rapl_msr: Convert rapl_msr_priv into pointer x86/msr-index: sort AMD RAPL MSRs by address