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

Merge 9314cd0f ("ASoC: qcom: use drvdata instead of component to keep id")... 


Merge 9314cd0f ("ASoC: qcom: use drvdata instead of component to keep id") into android16-6.12-lts

Steps on the way to 6.12.43

Resolves merge conflicts in:
	drivers/platform/chrome/cros_ec_typec.c

Change-Id: I15126d1886259c1186ee8d96e6e19fa3e6c6eaad
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 7ef32367 9314cd0f
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