Files
linux/kernel/power
Greg Kroah-Hartman 02eca6c60e Merge 883fd0aba1 ("Merge tag 'acpi-5.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline
Steps on the way to 5.17-rc4

Resolves conflicts in:
	drivers/base/power/wakeup.c
	kernel/power/suspend.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I187e72f9cbfc98b3bc31b3d6a6d38dfb5e1ffb35
2022-02-17 11:43:31 +01:00
..
2021-04-08 19:37:21 +02:00
2020-05-15 14:53:20 +02:00
2020-08-23 17:36:59 -05:00