Commit eaf00407 authored by Tudor Ambarus's avatar Tudor Ambarus Committed by Carlos Llamas
Browse files

Merge 2a2274e9 ("Merge tag 'pmdomain-v6.15' of... 

Merge 2a2274e9 ("Merge tag 'pmdomain-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm"

) into android-mainline

Steps on the way to v6.15-rc1

Fix conflicts in:
	drivers/cpuidle/cpuidle-psci.c

Change-Id: Ibac7cc3786221d73bf0ac557c42f15e97d3e41f0
Signed-off-by: default avatarTudor Ambarus <tudordana@google.com>
parents 0b97ada9 2a2274e9
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment