Commit ed4c442c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Merge c56ba3ea ("misc: fastrpc: Fix copy buffer page size") into android14-6.1-lts 



Steps on the way to 6.1.129

Resolves merge conflicts with:
	drivers/i3c/master.c

Change-Id: Ic60a64372e5acbd938424301c505f7520ca81003
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 590a9243 c56ba3ea
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