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

Merge 9ba18e40 ("bus: mhi: host: Fix conflict between power_up and... 


Merge 9ba18e40 ("bus: mhi: host: Fix conflict between power_up and SYSERR") into android12-5.10-lts

Steps on the way to 5.10.239

Resolves merge conflicts in:
	fs/nfsd/nfssvc.c

Change-Id: I6ec7fe81e413b70f489b1ffc928de97aee99d433
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents d169a168 9ba18e40
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