tree 3c48fabced8e519ef3f83209a793dfea48dbbfa8
parent 006f367e38fb45e2f161c0f500c74449ae63e866
parent b1a0aac05f044e78a589bfd7a9e2334aa640eb45
author Takashi Iwai <tiwai@suse.de> 1233126512 +0100
committer Takashi Iwai <tiwai@suse.de> 1233126512 +0100

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

Conflicts:
	sound/soc/soc-core.c