Merge staging-next into staging

2019-08-31 10:04:20 +02:00
parent ebe4fd146b fc74ba8291
commit ad1d58c622
364 changed files with 8970 additions and 6854 deletions
@@ -112,11 +112,13 @@ let
      # Hibernate / suspend.
      "hibernate.target"
      "suspend.target"
+      "suspend-then-hibernate.target"
      "sleep.target"
      "hybrid-sleep.target"
      "systemd-hibernate.service"
      "systemd-hybrid-sleep.service"
      "systemd-suspend.service"
+      "systemd-suspend-then-hibernate.service"

      # Reboot stuff.
      "reboot.target"