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

Merge f976d964 ("Input: adp5589-keys - fix adp5589_gpio_get_value()") into android12-5.10-lts 



Steps on the way to 5.10.227

Resolves merge conflicts in:
	fs/nfsd/nfs4xdr.c
	fs/nfsd/vfs.c

Change-Id: I8ed4156759977aa5c53d577990f4b72e61530ebf
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 6a00671a f976d964
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