Skip to content
GitLab
Commit 287d414e authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/fsl' of... 

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

Conflicts:
	sound/soc/fsl/Kconfig
parents 43248122 7b8751ab
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