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

Merge 0c813dbc ("calipso: Don't call calipso functions for AF_INET sk.")... 


Merge 0c813dbc ("calipso: Don't call calipso functions for AF_INET sk.") into android12-5.10-lts

Steps on the way to 5.10.239

Change-Id: I365a1b8522476c7b8304358c652b4aeac48b9213
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 0d430a29 0c813dbc
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