From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 28 Jan 2009 07:08:32 +0000 (+0100)
Subject: Merge branch 'topic/snd_card_new-err' into topic/asoc
X-Git-Tag: v2.6.30-rc1~8^2~132
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67fcdead3c7424d51e7108c220c9ab1a5e752ed3;p=pandora-kernel.git

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

Conflicts:
	sound/soc/soc-core.c
---

67fcdead3c7424d51e7108c220c9ab1a5e752ed3
Reading git-diff-tree failed