Skip to content
GitLab
Commit 8db0d35b authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/tlv320aic23' of... 

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

Conflicts:
	sound/soc/fsl/Kconfig
parents d433570d cc1bc54a
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment