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

Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm 

Conflicts:
	sound/soc/fsl/imx-sgtl5000.c
parents 9ff50721 50d4a790
Hide whitespace changes
Inline Side-by-side
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