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

Merge 6796844c ("sparc: vDSO: fix return value of __setup handler") into android-mainline 



Steps on the way to 5.10.215

Resolves merge conflicts in:
	drivers/tty/serial/max310x.c

Change-Id: I56ba9d336491315ce1d75db70354e2821885241c
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 8963a747 6796844c
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