Greg Kroah-Hartman a4f98a7ebd Merge 228dfe98a3 ("Merge tag 'char-misc-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into android-mainline ... Steps on the way to 6.0-rc1 Resolves merge conflicts in: drivers/android/Kconfig drivers/android/binder.c drivers/misc/Makefile Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ied4316f324d592bf13d257871d9a27114a59f783		2022-08-21 14:30:36 +02:00
..
autosleep.c
console.c
energy_model.c	PM: EM: convert power field to micro-Watts precision and align drivers	2022-07-15 19:17:30 +02:00
hibernate.c	PM: hibernate: Use kernel_can_power_off()	2022-06-21 20:57:30 +02:00
Kconfig	pm/sleep: Add PM_USERSPACE_AUTOSLEEP Kconfig	2022-07-01 10:39:20 +02:00
main.c	cxl for 5.19	2022-05-27 21:24:19 -07:00
Makefile	Merge 09583dfed2 ("Merge tag 'pm-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline	2022-06-07 18:10:15 +02:00
power.h	PM: hibernate: Allow ACPI hardware signature to be honoured	2021-12-08 16:06:10 +01:00
poweroff.c
process.c	Merge 09583dfed2 ("Merge tag 'pm-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline	2022-06-07 18:10:15 +02:00
qos.c	PM: QoS: Add check to make sure CPU freq is non-negative	2022-07-26 20:48:33 +02:00
snapshot.c	PM: hibernate: Don't mark comment as kernel-doc	2022-04-13 17:09:37 +02:00
suspend.c	Merge f8a52af9d0 ("Merge tag 'i2c-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline	2022-06-29 20:00:36 +02:00
suspend_test.c	PM: suspend: fix return value of __setup handler	2022-03-01 18:55:07 +01:00
swap.c	PM: Use the enum req_op and blk_opf_t types	2022-07-14 12:14:33 -06:00
user.c	PM: hibernate: defer device probing when resuming from hibernation	2022-07-26 20:39:01 +02:00
wakelock.c	PM: wakeup: simplify the output logic of pm_show_wakelocks()	2022-01-25 18:27:02 +01:00
wakeup_reason.c