Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit a7834aa9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/rt286' of...

Merge branch 'topic/rt286' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-w-codec

Conflicts:
	sound/soc/codecs/rt286.c
parents 96da4e5b 54d96a40
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment