Greg Kroah-Hartman 2f7599f2af Merge 833db72142 ("Merge tag 'pm-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline ...

Steps on the way to 5.16-rc1.

Resolves merge conflicts in:
	kernel/power/suspend.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie7497d13d654d3a430082291090b626b1bc638c2

2021-11-10 14:03:34 +01:00

..

autosleep.c

PM: sleep: fix typos in comments

2021-04-08 19:37:21 +02:00

console.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

energy_model.c

PM: EM: Mark inefficiencies in CPUFreq

2021-10-05 16:33:05 +02:00

hibernate.c

PM: sleep: Pause cpuidle later and resume it earlier during system transitions

2021-10-26 15:52:07 +02:00

Kconfig

PM: sleep: remove trailing spaces and tabs

2021-06-11 18:49:09 +02:00

main.c

PM: sleep: unmark 'state' functions as kernel-doc

2021-08-16 18:49:39 +02:00

Makefile

Merge faa392181a ("Merge tag 'drm-next-2020-06-02' of git://anongit.freedesktop.org/drm/drm") into android-mainline

2020-06-12 15:13:27 +02:00

power.h

PM: sleep: Pause cpuidle later and resume it earlier during system transitions

2021-10-26 15:52:07 +02:00

poweroff.c

kernel/power: constify sysrq_key_op

2020-05-15 14:53:20 +02:00

process.c

Merge c0d6586afa ("Merge tag 'acpi-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline

2021-11-10 11:47:54 +01:00

qos.c

treewide: Use fallthrough pseudo-keyword

2020-08-23 17:36:59 -05:00

snapshot.c

PM: hibernate: remove leading spaces before tabs

2021-06-11 18:52:05 +02:00

suspend_test.c

PM: sleep: check RTC features instead of ops in suspend_test

2021-08-04 20:23:05 +02:00

suspend.c

Merge 833db72142 ("Merge tag 'pm-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline

2021-11-10 14:03:34 +01:00

swap.c

PM: hibernate: Get block device exclusively in swsusp_check()

2021-10-21 19:38:32 +02:00

user.c

Merge tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block

2020-10-13 12:12:44 -07:00

wakelock.c

PM / wakeup: Show wakeup sources stats in sysfs

2019-08-21 00:20:40 +02:00

wakeup_reason.c

ANDROID: power: Export log_{suspend_abort,abnormal_wakeup}_reason

2020-08-25 00:32:03 +00:00