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

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

Conflicts:
	sound/soc/fsl/fsl_ssi.c
parents b968d83f 64aa5f58
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment