Skip to content
Commit 20aeeb35 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/workq-update' into topic/asoc 

Conflicts:
	sound/soc/codecs/wm8350.c
	sound/soc/codecs/wm8753.c
	sound/soc/sh/fsi.c
	sound/soc/soc-core.c
parents 07a9e2b2 5b84ba26
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