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

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

Conflicts:
	sound/soc/fsl/fsl_ssi.c
parents d60336e2 1d73ad29
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