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

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

Merge branch 'topic/owner' of... 

Merge branch 'topic/owner' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-ssm4567

Conflicts:
	sound/soc/codecs/ssm4567.c
parents eeffd4b4 1c07a4de
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment