Skip to content
GitLab
Commit 67fcdead authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/snd_card_new-err' into topic/asoc 

Conflicts:
	sound/soc/soc-core.c
parents 006f367e b1a0aac0
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