Greg Kroah-Hartman 170fc3254c Merge 6f3952cbe0 ("Merge tag 'for-5.12-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux") into android-mainline ... Steps on the way to 5.12-rc1. Resolves merge conflicts in: drivers/base/power/main.c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Iad58c40d8ec08d50284751ed3530186f373546d1		2021-02-25 15:29:39 +01:00
..
autosleep.c	PM / wakeup: Show wakeup sources stats in sysfs	2019-08-21 00:20:40 +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: update the comments related to power scale	2020-11-10 20:29:28 +01:00
hibernate.c	kernel/power: allow hibernation with page_poison sanity checking	2020-12-15 12:13:46 -08:00
Kconfig	PM: Kconfig: remove unneeded "default n" options	2021-02-12 16:43:23 +01:00
main.c	PM: sleep: Constify static struct attribute_group	2021-02-12 16:46:59 +01: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	kernel/power: allow hibernation with page_poison sanity checking	2020-12-15 12:13:46 -08:00
poweroff.c	kernel/power: constify sysrq_key_op	2020-05-15 14:53:20 +02:00
process.c	Merge 6f3952cbe0 ("Merge tag 'for-5.12-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux") into android-mainline	2021-02-25 15:29:39 +01:00
qos.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
snapshot.c	kernel/power: allow hibernation with page_poison sanity checking	2020-12-15 12:13:46 -08:00
suspend_test.c	PM: sleep: Switch to rtc_time64_to_tm()/rtc_tm_to_time64()	2019-12-20 09:58:08 +01:00
suspend.c	Merge b4ec805464 ("Merge tag 'pm-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline	2020-12-18 15:32:45 +01:00
swap.c	PM: hibernate: flush swap writer after marking	2021-01-25 18:52:30 +01:00
user.c	block-5.10-2020-10-12	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