Commit 629a0102 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3786416e ("powerpc: update ppc_save_regs to save current r1 in... 


Merge 3786416e ("powerpc: update ppc_save_regs to save current r1 in pt_regs") into android13-5.15-lts

Steps on the way to 5.15.121

Resolves merge conflicts in:
	drivers/pinctrl/bcm/pinctrl-bcm2835.c

Change-Id: Ifd551fc338bb9156d68180274888449af2ee1922
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 774cde67 3786416e
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