Commit 85445b5a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge f4fab74c ("serial: amba-pl011: Fix DMA transmission in RS485 mode") into android-mainline 



Steps on the way to 5.15.150

Resolves merge conflicts in:
	fs/erofs/decompressor.c

Change-Id: I4fff98cd6e28b8c2cafa245fb38438c5216039a6
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 19f346d2 f4fab74c
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